From 36c24aa59046b746ac0079ac7f725b63c9f71782 Mon Sep 17 00:00:00 2001 From: Marc Nuri Date: Fri, 6 Sep 2024 11:22:02 +0200 Subject: [PATCH] refactor: openshift-model & openshift-mode-miscellaneous generated from OpenAPI schemas Signed-off-by: Marc Nuri --- Makefile | 2 + doc/MIGRATION-v7.md | 29 +- kubernetes-model-generator/generateModel.sh | 2 - .../openapi/generator/go.mod | 1 + .../openapi/generator/go.sum | 2 + .../openapi/generator/main.go | 11 + .../generator/model/ModelGenerator.java | 9 +- .../generator/model/TemplateContext.java | 1 + .../schema/generator/schema/SchemaUtils.java | 2 + .../model_class_annotations.mustache | 2 +- .../schemas/openshift-authorization.json | 1 + .../openapi/schemas/openshift-security.json | 1 + .../openshift-model-hive/pom.xml | 4 + .../openshift-model-miscellaneous/Makefile | 27 - .../cmd/generate/generate.go | 130 -- .../openshift-model-miscellaneous/pom.xml | 56 +- .../kubernetes/api/model/KubeSchema.java | 386 ----- .../api/model/ValidationSchema.java | 386 ----- .../apiserver/v1/APIRequestCount.java | 11 +- .../apiserver/v1/APIRequestCountStatus.java | 21 +- .../v1/APIRequestCountStatusCHBNBUByVerb.java | 122 ++ .../v1/APIRequestCountStatusCHBNByUser.java | 154 ++ .../v1/APIRequestCountStatusCHByNode.java | 140 ++ .../v1/APIRequestCountStatusConditions.java | 178 +++ .../v1/APIRequestCountStatusCurrentHour.java | 126 ++ ... => APIRequestCountStatusLBNBUByVerb.java} | 12 +- ...va => APIRequestCountStatusLBNByUser.java} | 18 +- ...java => APIRequestCountStatusLByNode.java} | 18 +- ...java => APIRequestCountStatusLast24h.java} | 18 +- .../v1/CredentialsRequest.java | 11 +- .../v1/CredentialsRequestSpec.java | 41 +- .../v1/CredentialsRequestSpecSecretRef.java | 192 +++ .../v1/CredentialsRequestStatus.java | 38 +- ...> CredentialsRequestStatusConditions.java} | 12 +- .../cni/v1/NetworkAttachmentDefinition.java | 11 +- .../helm/v1beta1}/HelmChartRepository.java | 13 +- .../v1beta1}/HelmChartRepositoryList.java | 12 +- .../v1beta1}/HelmChartRepositorySpec.java | 10 +- .../v1beta1/HelmChartRepositorySpecCCCa.java} | 14 +- ...mChartRepositorySpecCCTlsClientConfig.java | 108 ++ ...mChartRepositorySpecConnectionConfig.java} | 28 +- .../v1beta1}/HelmChartRepositoryStatus.java | 11 +- .../HelmChartRepositoryStatusConditions.java | 178 +++ .../v1beta1}/ProjectHelmChartRepository.java | 19 +- .../ProjectHelmChartRepositoryList.java | 12 +- .../ProjectHelmChartRepositorySpec.java | 10 +- ...ChartRepositorySpecCCBasicAuthConfig.java} | 34 +- .../ProjectHelmChartRepositorySpecCCCa.java | 108 ++ ...mChartRepositorySpecCCTlsClientConfig.java | 108 ++ ...mChartRepositorySpecConnectionConfig.java} | 34 +- .../ProjectHelmChartRepositoryStatus.java} | 20 +- ...ctHelmChartRepositoryStatusConditions.java | 178 +++ .../operator/v1/ImageRegistryConfigProxy.java | 136 -- .../v1/ImageRegistryConfigRequests.java | 122 -- .../v1/ImageRegistryConfigRequestsLimits.java | 137 -- .../v1/ImageRegistryConfigStorage.java | 220 --- .../ImageRegistryConfigStorageAlibabaOSS.java | 150 -- .../ImageRegistryConfigStorageEmptyDir.java | 83 - .../v1/ImageRegistryConfigStorageGCS.java | 150 -- .../v1/ImageRegistryConfigStorageIBMCOS.java | 164 -- .../v1/ImageRegistryConfigStorageS3.java | 206 --- ...mageRegistryConfigStorageS3CloudFront.java | 152 -- .../v1/ImageRegistryConfigStorageSwift.java | 206 --- .../operator/v1/ImageRegistrySpec.java | 404 ----- .../v1alpha1/BMCEventSubscription.java} | 43 +- .../v1alpha1/BMCEventSubscriptionList.java | 195 +++ .../v1alpha1/BMCEventSubscriptionSpec.java | 150 ++ ...MCEventSubscriptionSpecHttpHeadersRef.java | 122 ++ .../v1alpha1/BMCEventSubscriptionStatus.java | 122 ++ .../metal3/v1alpha1/BareMetalHost.java | 11 +- .../metal3/v1alpha1/BareMetalHostSpec.java | 73 +- ...Details.java => BareMetalHostSpecBmc.java} | 12 +- .../BareMetalHostSpecConsumerRef.java | 192 +++ ...ava => BareMetalHostSpecCustomDeploy.java} | 12 +- ...ig.java => BareMetalHostSpecFirmware.java} | 12 +- ...Image.java => BareMetalHostSpecImage.java} | 12 +- .../v1alpha1/BareMetalHostSpecMetaData.java} | 14 +- .../BareMetalHostSpecNetworkData.java | 122 ++ ...Config.java => BareMetalHostSpecRaid.java} | 34 +- ... => BareMetalHostSpecRootDeviceHints.java} | 12 +- .../v1alpha1/BareMetalHostSpecTaints.java | 150 ++ .../v1alpha1/BareMetalHostSpecUserData.java | 122 ++ .../metal3/v1alpha1/BareMetalHostStatus.java | 32 +- ...> BareMetalHostStatusGoodCredentials.java} | 12 +- .../v1alpha1/BareMetalHostStatusHCpu.java | 168 ++ .../v1alpha1/BareMetalHostStatusHFBios.java | 136 ++ .../BareMetalHostStatusHFirmware.java} | 34 +- .../v1alpha1/BareMetalHostStatusHNVlans.java | 122 ++ ...ume.java => BareMetalHostStatusHNics.java} | 148 +- .../v1alpha1/BareMetalHostStatusHStorage.java | 266 ++++ .../BareMetalHostStatusHSystemVendor.java | 136 ++ .../v1alpha1/BareMetalHostStatusHardware.java | 198 +++ .../BareMetalHostStatusOHDeprovision.java | 126 ++ ...java => BareMetalHostStatusOHInspect.java} | 28 +- .../BareMetalHostStatusOHProvision.java | 126 ++ .../BareMetalHostStatusOHRegister.java | 126 ++ ... BareMetalHostStatusOperationHistory.java} | 36 +- .../BareMetalHostStatusPCustomDeploy.java} | 28 +- .../BareMetalHostStatusPFirmware.java | 136 ++ .../v1alpha1/BareMetalHostStatusPImage.java | 150 ++ .../v1alpha1/BareMetalHostStatusPRaid.java | 126 ++ .../BareMetalHostStatusPRootDeviceHints.java | 234 +++ ...a => BareMetalHostStatusProvisioning.java} | 54 +- .../BareMetalHostStatusTriedCredentials.java | 123 ++ .../v1alpha1/DataImage.java} | 43 +- .../v1alpha1/DataImageList.java} | 28 +- .../v1alpha1/DataImageSpec.java} | 34 +- .../metal3/v1alpha1/DataImageStatus.java | 136 ++ .../DataImageStatusAttachedImage.java | 108 ++ .../metal3/v1alpha1/DataImageStatusError.java | 122 ++ .../metal3/v1alpha1/FirmwareSchema.java} | 37 +- .../metal3/v1alpha1/FirmwareSchemaList.java} | 28 +- .../metal3/v1alpha1/FirmwareSchemaSpec.java | 138 ++ .../v1alpha1/FirmwareSchemaSpecSchema.java | 210 +++ .../metal3/v1alpha1/HardwareData.java | 190 +++ .../v1alpha1/HardwareDataList.java} | 28 +- .../metal3/v1alpha1/HardwareDataSpec.java | 108 ++ .../{CPU.java => HardwareDataSpecHCpu.java} | 12 +- ...{BIOS.java => HardwareDataSpecHFBios.java} | 12 +- ...re.java => HardwareDataSpecHFirmware.java} | 18 +- ...VLAN.java => HardwareDataSpecHNVlans.java} | 12 +- .../{NIC.java => HardwareDataSpecHNics.java} | 18 +- ...age.java => HardwareDataSpecHStorage.java} | 12 +- ...ava => HardwareDataSpecHSystemVendor.java} | 12 +- ...ils.java => HardwareDataSpecHardware.java} | 42 +- .../v1alpha1/HostFirmwareComponents.java | 204 +++ .../v1alpha1/HostFirmwareComponentsList.java | 195 +++ .../v1alpha1/HostFirmwareComponentsSpec.java} | 34 +- .../HostFirmwareComponentsSpecUpdates.java | 122 ++ .../HostFirmwareComponentsStatus.java | 158 ++ ...ostFirmwareComponentsStatusComponents.java | 164 ++ ...ostFirmwareComponentsStatusConditions.java | 178 +++ .../HostFirmwareComponentsStatusUpdates.java | 122 ++ .../metal3/v1alpha1/HostFirmwareSettings.java | 204 +++ .../v1alpha1/HostFirmwareSettingsList.java | 195 +++ .../v1alpha1/HostFirmwareSettingsSpec.java | 112 ++ .../v1alpha1/HostFirmwareSettingsStatus.java | 156 ++ .../HostFirmwareSettingsStatusConditions.java | 178 +++ .../HostFirmwareSettingsStatusSchema.java | 122 ++ .../metal3/v1alpha1/PreprovisioningImage.java | 204 +++ .../v1alpha1/PreprovisioningImageList.java | 195 +++ .../v1alpha1/PreprovisioningImageSpec.java | 140 ++ .../v1alpha1/PreprovisioningImageStatus.java | 196 +++ .../PreprovisioningImageStatusConditions.java | 178 +++ ...PreprovisioningImageStatusNetworkData.java | 122 ++ .../v1alpha1/Provisioning.java} | 43 +- .../metal3/v1alpha1/ProvisioningList.java} | 28 +- .../metal3/v1alpha1/ProvisioningSpec.java | 294 ++++ ...ningSpecPreProvisioningOSDownloadURLs.java | 150 ++ .../v1alpha1/ProvisioningStatus.java} | 56 +- .../ProvisioningStatusConditions.java} | 14 +- .../ProvisioningStatusGenerations.java} | 96 +- .../metal3/v1beta1/Metal3Remediation.java | 11 +- .../metal3/v1beta1/Metal3RemediationSpec.java | 8 +- ...ava => Metal3RemediationSpecStrategy.java} | 19 +- .../v1beta1/Metal3RemediationTemplate.java | 11 +- .../Metal3RemediationTemplateSpec.java | 8 +- .../Metal3RemediationTemplateSpecTSpec.java} | 48 +- ...3RemediationTemplateSpecTSpecStrategy.java | 136 ++ ...etal3RemediationTemplateSpecTemplate.java} | 18 +- .../Metal3RemediationTemplateStatus.java | 8 +- ...etal3RemediationTemplateStatusStatus.java} | 74 +- .../cloud/v1/CloudPrivateIPConfig.java | 203 +++ .../v1/CloudPrivateIPConfigList.java} | 26 +- .../cloud/v1/CloudPrivateIPConfigSpec.java} | 34 +- .../cloud/v1/CloudPrivateIPConfigStatus.java | 126 ++ .../CloudPrivateIPConfigStatusConditions.java | 178 +++ .../operator/v1/EgressRouterInterface.java | 108 -- .../network/operator/v1/EgressRouterSpec.java | 154 -- .../network/operator/v1/L4RedirectRule.java | 150 -- .../operator/v1/OperatorPKIStatus.java | 83 - .../apiserver/v1/APIRequestCountTest.java | 6 +- .../ProjectHelmChartRepositoryTest.java | 8 +- .../Metal3RemediationTemplateTest.java | 17 +- .../metal3/v1beta1/Metal3RemediationTest.java | 13 +- ...st-v1beta1-projecthelmchartrepository.json | 0 .../network}/v1/EgressRouterTest.java | 8 +- .../test/resources/valid-egressrouter.json | 0 .../openshift-model-operatorhub/pom.xml | 2 +- .../openshift-model/Makefile | 27 - .../openshift-model/cmd/generate/generate.go | 254 --- .../openshift-model/pom.xml | 105 +- .../kubernetes/api/model/KubeSchema.java | 1417 ----------------- .../api/model/ValidationSchema.java | 1417 ----------------- .../model/AppliedClusterResourceQuota.java | 11 +- .../api/model/BrokerTemplateInstance.java | 11 +- .../api/model/BrokerTemplateInstanceSpec.java | 17 +- .../io/fabric8/openshift/api/model/Build.java | 11 +- .../openshift/api/model/BuildConfig.java | 11 +- .../openshift/api/model/BuildConfigSpec.java | 11 +- .../{HostSubnetList.java => BuildLog.java} | 54 +- .../openshift/api/model/BuildOutput.java | 20 +- .../openshift/api/model/BuildRequest.java | 26 +- .../openshift/api/model/BuildSource.java | 11 +- .../openshift/api/model/BuildSpec.java | 11 +- .../openshift/api/model/BuildStatus.java | 11 +- .../openshift/api/model/ClusterNetwork.java | 276 ---- .../api/model/ClusterResourceQuota.java | 11 +- .../model/ClusterResourceQuotaSelector.java | 11 +- ...ResourceQuotaSpecQSSMatchExpressions.java} | 76 +- ...usterResourceQuotaSpecQScopeSelector.java} | 48 +- .../model/ClusterResourceQuotaSpecQuota.java | 144 ++ ... => ClusterResourceQuotaSpecSelector.java} | 56 +- .../api/model/ClusterResourceQuotaStatus.java | 21 +- ...a => ClusterResourceQuotaStatusTotal.java} | 58 +- .../openshift/api/model/ClusterRole.java | 11 +- .../api/model/ClusterRoleBinding.java | 26 +- .../api/model/ConfigMapBuildSource.java | 11 +- .../api/model/CustomBuildStrategy.java | 20 +- .../model/DeploymentCauseImageTrigger.java | 11 +- .../openshift/api/model/DeploymentConfig.java | 11 +- .../model/DeploymentConfigRollbackSpec.java | 11 +- .../api/model/DeploymentConfigSpec.java | 11 +- .../openshift/api/model/DeploymentLog.java | 161 ++ .../api/model/DeploymentRequest.java | 221 +++ .../api/model/DeploymentStrategy.java | 11 +- .../DeploymentTriggerImageChangeParams.java | 11 +- .../api/model/DockerBuildStrategy.java | 20 +- .../api/model/EgressNetworkPolicyPeer.java | 122 -- .../io/fabric8/openshift/api/model/Group.java | 11 +- .../openshift/api/model/GroupList.java | 3 +- .../openshift/api/model/HostSubnet.java | 250 --- .../fabric8/openshift/api/model/Identity.java | 20 +- .../io/fabric8/openshift/api/model/Image.java | 20 +- ...triction.java => ImageBlobReferences.java} | 91 +- .../openshift/api/model/ImageChangeCause.java | 11 +- .../api/model/ImageChangeTrigger.java | 11 +- .../openshift/api/model/ImageImportSpec.java | 20 +- .../openshift/api/model/ImageLayerData.java} | 54 +- .../openshift/api/model/ImageSignature.java | 11 +- .../openshift/api/model/ImageSource.java | 20 +- .../openshift/api/model/ImageStream.java | 11 +- .../openshift/api/model/ImageStreamImage.java | 11 +- .../api/model/ImageStreamImport.java | 11 +- ...PolicyList.java => ImageStreamLayers.java} | 67 +- .../api/model/ImageStreamMapping.java | 11 +- .../openshift/api/model/ImageStreamTag.java | 11 +- .../fabric8/openshift/api/model/ImageTag.java | 11 +- .../api/model/LocalObjectReference.java | 107 ++ .../api/model/LocalResourceAccessReview.java | 19 +- .../api/model/LocalSubjectAccessReview.java | 19 +- .../openshift/api/model/NetNamespace.java | 220 --- .../openshift/api/model/OAuthAccessToken.java | 11 +- .../api/model/OAuthAuthorizeToken.java | 11 +- .../openshift/api/model/OAuthClient.java | 11 +- .../api/model/OAuthClientAuthorization.java | 11 +- .../api/model/PodSecurityPolicyReview.java | 3 +- .../model/PodSecurityPolicyReviewSpec.java | 11 +- .../PodSecurityPolicySelfSubjectReview.java | 3 +- ...odSecurityPolicySelfSubjectReviewSpec.java | 11 +- .../model/PodSecurityPolicySubjectReview.java | 3 +- .../PodSecurityPolicySubjectReviewSpec.java | 11 +- .../PodSecurityPolicySubjectReviewStatus.java | 20 +- .../openshift/api/model/PolicyRule.java | 16 +- .../fabric8/openshift/api/model/Project.java | 11 +- .../openshift/api/model/ProjectRequest.java | 11 +- .../openshift/api/model/RangeAllocation.java | 11 +- .../api/model/RepositoryImportSpec.java | 11 +- .../api/model/ResourceAccessReview.java | 16 +- .../model/ResourceAccessReviewResponse.java | 43 +- .../io/fabric8/openshift/api/model/Role.java | 11 +- .../openshift/api/model/RoleBinding.java | 26 +- .../api/model/RoleBindingRestriction.java | 11 +- .../api/model/RoleBindingRestrictionSpec.java | 26 +- .../RollingDeploymentStrategyParams.java | 17 +- .../io/fabric8/openshift/api/model/Route.java | 11 +- .../openshift/api/model/RouteHTTPHeader.java | 122 ++ ...e.java => RouteHTTPHeaderActionUnion.java} | 32 +- ...ction.java => RouteHTTPHeaderActions.java} | 55 +- .../openshift/api/model/RouteHTTPHeaders.java | 108 ++ .../openshift/api/model/RoutePort.java | 11 +- .../api/model/RouteSetHTTPHeader.java | 108 ++ .../openshift/api/model/RouteSpec.java | 16 +- .../api/model/SecretBuildSource.java | 11 +- .../openshift/api/model/SecretSpec.java | 11 +- .../api/model/SecurityContextConstraints.java | 25 +- .../api/model/SelfSubjectRulesReview.java | 3 +- ...eAccountPodSecurityPolicyReviewStatus.java | 20 +- .../api/model/SourceBuildStrategy.java | 20 +- .../api/model/SubjectAccessReview.java | 16 +- .../model/SubjectAccessReviewResponse.java | 43 +- .../api/model/SubjectRulesReview.java | 3 +- .../openshift/api/model/TLSConfig.java | 16 +- .../openshift/api/model/TagImageHook.java | 11 +- .../openshift/api/model/TagReference.java | 11 +- .../fabric8/openshift/api/model/Template.java | 25 +- .../openshift/api/model/TemplateInstance.java | 11 +- .../api/model/TemplateInstanceObject.java | 11 +- .../api/model/TemplateInstanceSpec.java | 11 +- .../io/fabric8/openshift/api/model/User.java | 11 +- .../api/model/UserIdentityMapping.java | 26 +- .../api/model/UserOAuthAccessToken.java | 11 +- .../kubernetes/api/model/TemplateTest.java | 2 +- .../server/mock/APIRequestCountTest.java | 4 +- .../client/server/mock/BareMetalHostTest.java | 7 - .../server/mock/CredentialsRequestTest.java | 9 +- .../server/mock/EgressNetworkPolicyTest.java | 124 -- .../client/server/mock/EgressRouterTest.java | 8 +- .../server/mock/HelmChartRepositoryTest.java | 8 +- .../client/server/mock/HostSubnetTest.java | 92 -- .../mock/ImageRegistryOperatorConfigTest.java | 13 +- .../mock/Metal3RemediationTemplateTest.java | 3 +- .../server/mock/Metal3RemediationTest.java | 3 +- .../client/server/mock/OpenShiftLoadTest.java | 4 +- .../server/mock/OpenShiftResourcesTest.java | 14 +- .../client/server/mock/OperatorPKITest.java | 8 +- .../mock/ProjectHelmChartRepositoryTest.java | 8 +- .../mock/RoleBindingRestrictionTest.java | 6 +- .../SecurityContextConstraintsCrudTest.java | 71 +- .../mock/SecurityContextConstraintsTest.java | 38 +- .../client/server/mock/TemplateTest.java | 13 +- .../NamespacedOpenShiftClientAdapter.java | 47 +- .../openshift/client/OpenShiftClient.java | 56 +- .../internal/core/TemplateOperationsImpl.java | 23 +- .../client/impl/OpenShiftClientImpl.java | 51 +- 315 files changed, 13350 insertions(+), 9963 deletions(-) create mode 100644 kubernetes-model-generator/openapi/schemas/openshift-authorization.json create mode 100644 kubernetes-model-generator/openapi/schemas/openshift-security.json delete mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/Makefile delete mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/cmd/generate/generate.go delete mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java delete mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/APIRequestCountStatusCHBNBUByVerb.java create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/APIRequestCountStatusCHBNByUser.java create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/APIRequestCountStatusCHByNode.java create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/APIRequestCountStatusConditions.java create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/APIRequestCountStatusCurrentHour.java rename kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/{PerVerbAPIRequestCount.java => APIRequestCountStatusLBNBUByVerb.java} (88%) rename kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/{PerUserAPIRequestCount.java => APIRequestCountStatusLBNByUser.java} (85%) rename kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/{PerNodeAPIRequestLog.java => APIRequestCountStatusLByNode.java} (85%) rename kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/{PerResourceAPIRequestLog.java => APIRequestCountStatusLast24h.java} (84%) create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/cloudcredential/v1/CredentialsRequestSpecSecretRef.java rename kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/cloudcredential/v1/{CredentialsRequestCondition.java => CredentialsRequestStatusConditions.java} (90%) rename kubernetes-model-generator/{openshift-model/src/generated/java/io/fabric8/openshift/api/model => openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1}/HelmChartRepository.java (91%) rename kubernetes-model-generator/{openshift-model/src/generated/java/io/fabric8/openshift/api/model => openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1}/HelmChartRepositoryList.java (89%) rename kubernetes-model-generator/{openshift-model/src/generated/java/io/fabric8/openshift/api/model => openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1}/HelmChartRepositorySpec.java (90%) rename kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/{imageregistry/operator/v1/S3TrustedCASource.java => helm/v1beta1/HelmChartRepositorySpecCCCa.java} (87%) create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1/HelmChartRepositorySpecCCTlsClientConfig.java rename kubernetes-model-generator/{openshift-model/src/generated/java/io/fabric8/openshift/api/model/ConnectionConfig.java => openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1/HelmChartRepositorySpecConnectionConfig.java} (77%) rename kubernetes-model-generator/{openshift-model/src/generated/java/io/fabric8/openshift/api/model => openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1}/HelmChartRepositoryStatus.java (89%) create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1/HelmChartRepositoryStatusConditions.java rename kubernetes-model-generator/{openshift-model/src/generated/java/io/fabric8/openshift/api/model => openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1}/ProjectHelmChartRepository.java (89%) rename kubernetes-model-generator/{openshift-model/src/generated/java/io/fabric8/openshift/api/model => openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1}/ProjectHelmChartRepositoryList.java (89%) rename kubernetes-model-generator/{openshift-model/src/generated/java/io/fabric8/openshift/api/model => openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1}/ProjectHelmChartRepositorySpec.java (90%) rename kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/{network/operator/v1/OperatorPKISpec.java => helm/v1beta1/ProjectHelmChartRepositorySpecCCBasicAuthConfig.java} (78%) create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1/ProjectHelmChartRepositorySpecCCCa.java create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1/ProjectHelmChartRepositorySpecCCTlsClientConfig.java rename kubernetes-model-generator/{openshift-model/src/generated/java/io/fabric8/openshift/api/model/ConnectionConfigNamespaceScoped.java => openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1/ProjectHelmChartRepositorySpecConnectionConfig.java} (72%) rename kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/{network/operator/v1/EgressRouterStatus.java => helm/v1beta1/ProjectHelmChartRepositoryStatus.java} (80%) create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1/ProjectHelmChartRepositoryStatusConditions.java delete mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryConfigProxy.java delete mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryConfigRequests.java delete mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryConfigRequestsLimits.java delete mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryConfigStorage.java delete mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryConfigStorageAlibabaOSS.java delete mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryConfigStorageEmptyDir.java delete mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryConfigStorageGCS.java delete mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryConfigStorageIBMCOS.java delete mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryConfigStorageS3.java delete mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryConfigStorageS3CloudFront.java delete mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryConfigStorageSwift.java delete mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistrySpec.java rename kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/{network/operator/v1/EgressRouter.java => metal3/v1alpha1/BMCEventSubscription.java} (79%) create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BMCEventSubscriptionList.java create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BMCEventSubscriptionSpec.java create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BMCEventSubscriptionSpecHttpHeadersRef.java create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BMCEventSubscriptionStatus.java rename kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/{BMCDetails.java => BareMetalHostSpecBmc.java} (91%) create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostSpecConsumerRef.java rename kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/{CustomDeploy.java => BareMetalHostSpecCustomDeploy.java} (88%) rename kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/{FirmwareConfig.java => BareMetalHostSpecFirmware.java} (90%) rename kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/{Image.java => BareMetalHostSpecImage.java} (91%) rename kubernetes-model-generator/{openshift-model/src/generated/java/io/fabric8/openshift/api/model/ServiceAccountReference.java => openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostSpecMetaData.java} (88%) create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostSpecNetworkData.java rename kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/{RAIDConfig.java => BareMetalHostSpecRaid.java} (77%) rename kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/{RootDeviceHints.java => BareMetalHostSpecRootDeviceHints.java} (91%) create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostSpecTaints.java create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostSpecUserData.java rename kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/{CredentialsStatus.java => BareMetalHostStatusGoodCredentials.java} (88%) create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusHCpu.java create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusHFBios.java rename kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/{imageregistry/operator/v1/ImageRegistryConfigStoragePVC.java => metal3/v1alpha1/BareMetalHostStatusHFirmware.java} (78%) create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusHNVlans.java rename kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/{HardwareRAIDVolume.java => BareMetalHostStatusHNics.java} (56%) create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusHStorage.java create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusHSystemVendor.java create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusHardware.java create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusOHDeprovision.java rename kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/{OperationMetric.java => BareMetalHostStatusOHInspect.java} (77%) create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusOHProvision.java create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusOHRegister.java rename kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/{OperationHistory.java => BareMetalHostStatusOperationHistory.java} (74%) rename kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/{imageregistry/operator/v1/EncryptionAlibaba.java => metal3/v1alpha1/BareMetalHostStatusPCustomDeploy.java} (81%) create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusPFirmware.java create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusPImage.java create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusPRaid.java create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusPRootDeviceHints.java rename kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/{ProvisionStatus.java => BareMetalHostStatusProvisioning.java} (73%) create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusTriedCredentials.java rename kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/{network/operator/v1/OperatorPKI.java => metal3/v1alpha1/DataImage.java} (79%) rename kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/{imageregistry/operator/v1/ConfigList.java => metal3/v1alpha1/DataImageList.java} (82%) rename kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/{network/operator/v1/CertSpec.java => metal3/v1alpha1/DataImageSpec.java} (81%) create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/DataImageStatus.java create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/DataImageStatusAttachedImage.java create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/DataImageStatusError.java rename kubernetes-model-generator/{openshift-model/src/generated/java/io/fabric8/openshift/api/model/EgressNetworkPolicy.java => openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/FirmwareSchema.java} (80%) rename kubernetes-model-generator/{openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterNetworkList.java => openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/FirmwareSchemaList.java} (81%) create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/FirmwareSchemaSpec.java create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/FirmwareSchemaSpecSchema.java create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HardwareData.java rename kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/{network/operator/v1/EgressRouterList.java => metal3/v1alpha1/HardwareDataList.java} (83%) create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HardwareDataSpec.java rename kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/{CPU.java => HardwareDataSpecHCpu.java} (91%) rename kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/{BIOS.java => HardwareDataSpecHFBios.java} (90%) rename kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/{Firmware.java => HardwareDataSpecHFirmware.java} (85%) rename kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/{VLAN.java => HardwareDataSpecHNVlans.java} (90%) rename kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/{NIC.java => HardwareDataSpecHNics.java} (88%) rename kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/{Storage.java => HardwareDataSpecHStorage.java} (92%) rename kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/{HardwareSystemVendor.java => HardwareDataSpecHSystemVendor.java} (89%) rename kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/{HardwareDetails.java => HardwareDataSpecHardware.java} (77%) create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareComponents.java create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareComponentsList.java rename kubernetes-model-generator/{openshift-model/src/generated/java/io/fabric8/openshift/api/model/EgressNetworkPolicySpec.java => openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareComponentsSpec.java} (77%) create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareComponentsSpecUpdates.java create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareComponentsStatus.java create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareComponentsStatusComponents.java create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareComponentsStatusConditions.java create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareComponentsStatusUpdates.java create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareSettings.java create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareSettingsList.java create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareSettingsSpec.java create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareSettingsStatus.java create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareSettingsStatusConditions.java create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareSettingsStatusSchema.java create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/PreprovisioningImage.java create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/PreprovisioningImageList.java create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/PreprovisioningImageSpec.java create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/PreprovisioningImageStatus.java create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/PreprovisioningImageStatusConditions.java create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/PreprovisioningImageStatusNetworkData.java rename kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/{imageregistry/operator/v1/Config.java => metal3/v1alpha1/Provisioning.java} (79%) rename kubernetes-model-generator/{openshift-model/src/generated/java/io/fabric8/openshift/api/model/NetNamespaceList.java => openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/ProvisioningList.java} (83%) create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/ProvisioningSpec.java create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/ProvisioningSpecPreProvisioningOSDownloadURLs.java rename kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/{imageregistry/operator/v1/ImageRegistryStatus.java => metal3/v1alpha1/ProvisioningStatus.java} (70%) rename kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/{network/operator/v1/EgressRouterStatusCondition.java => metal3/v1alpha1/ProvisioningStatusConditions.java} (89%) rename kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/{imageregistry/operator/v1/ImageRegistryConfigRoute.java => metal3/v1alpha1/ProvisioningStatusGenerations.java} (59%) rename kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1beta1/{RemediationStrategy.java => Metal3RemediationSpecStrategy.java} (87%) rename kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/{network/operator/v1/EgressRouterAddress.java => metal3/v1beta1/Metal3RemediationTemplateSpecTSpec.java} (75%) create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1beta1/Metal3RemediationTemplateSpecTSpecStrategy.java rename kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1beta1/{Metal3RemediationTemplateResource.java => Metal3RemediationTemplateSpecTemplate.java} (82%) rename kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/{imageregistry/operator/v1/ImageRegistryConfigStorageAzure.java => metal3/v1beta1/Metal3RemediationTemplateStatusStatus.java} (65%) create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/cloud/v1/CloudPrivateIPConfig.java rename kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/{operator/v1/OperatorPKIList.java => cloud/v1/CloudPrivateIPConfigList.java} (83%) rename kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/{imageregistry/operator/v1/KMSEncryptionAlibaba.java => network/cloud/v1/CloudPrivateIPConfigSpec.java} (80%) create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/cloud/v1/CloudPrivateIPConfigStatus.java create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/cloud/v1/CloudPrivateIPConfigStatusConditions.java delete mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/EgressRouterInterface.java delete mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/EgressRouterSpec.java delete mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/L4RedirectRule.java delete mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/OperatorPKIStatus.java rename kubernetes-model-generator/{openshift-model/src/test/java/io/fabric8/openshift/api/model => openshift-model-miscellaneous/src/test/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1}/ProjectHelmChartRepositoryTest.java (92%) rename kubernetes-model-generator/{openshift-model => openshift-model-miscellaneous}/src/test/resources/test-v1beta1-projecthelmchartrepository.json (100%) rename kubernetes-model-generator/{openshift-model-miscellaneous/src/test/java/io/fabric8/openshift/api/model/miscellaneous/network/operator => openshift-model-operator/src/test/java/io/fabric8/openshift/api/model/operator/network}/v1/EgressRouterTest.java (92%) rename kubernetes-model-generator/{openshift-model-miscellaneous => openshift-model-operator}/src/test/resources/valid-egressrouter.json (100%) delete mode 100644 kubernetes-model-generator/openshift-model/Makefile delete mode 100644 kubernetes-model-generator/openshift-model/cmd/generate/generate.go delete mode 100644 kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java delete mode 100644 kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java rename kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/{HostSubnetList.java => BuildLog.java} (72%) delete mode 100644 kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterNetwork.java rename kubernetes-model-generator/{openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/SoftwareRAIDVolume.java => openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterResourceQuotaSpecQSSMatchExpressions.java} (66%) rename kubernetes-model-generator/{openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/RedirectConfig.java => openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterResourceQuotaSpecQScopeSelector.java} (71%) create mode 100644 kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterResourceQuotaSpecQuota.java rename kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/{ClusterNetworkEntry.java => ClusterResourceQuotaSpecSelector.java} (67%) rename kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/{ServiceAccountRestriction.java => ClusterResourceQuotaStatusTotal.java} (67%) create mode 100644 kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DeploymentLog.java create mode 100644 kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DeploymentRequest.java delete mode 100644 kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/EgressNetworkPolicyPeer.java delete mode 100644 kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/HostSubnet.java rename kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/{UserRestriction.java => ImageBlobReferences.java} (62%) rename kubernetes-model-generator/{openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/MacvlanConfig.java => openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageLayerData.java} (75%) rename kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/{EgressNetworkPolicyList.java => ImageStreamLayers.java} (73%) create mode 100644 kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/LocalObjectReference.java delete mode 100644 kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/NetNamespace.java create mode 100644 kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RouteHTTPHeader.java rename kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/{EgressNetworkPolicyRule.java => RouteHTTPHeaderActionUnion.java} (82%) rename kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/{GroupRestriction.java => RouteHTTPHeaderActions.java} (71%) create mode 100644 kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RouteHTTPHeaders.java create mode 100644 kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RouteSetHTTPHeader.java delete mode 100644 kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/EgressNetworkPolicyTest.java delete mode 100644 kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/HostSubnetTest.java diff --git a/Makefile b/Makefile index 156273f36e2..b9719c467cf 100644 --- a/Makefile +++ b/Makefile @@ -57,7 +57,9 @@ generate-openapi-classes: cd kubernetes-model-generator/kubernetes-model-resource && mvn -Pgenerate clean install cd kubernetes-model-generator/kubernetes-model-kustomize && mvn -Pgenerate clean install cd kubernetes-model-generator/openshift-model-config && mvn -Pgenerate clean install + cd kubernetes-model-generator/openshift-model && mvn -Pgenerate clean install cd kubernetes-model-generator/openshift-model-operator && mvn -Pgenerate clean install + cd kubernetes-model-generator/openshift-model-miscellaneous && mvn -Pgenerate clean install # Legacy generation of the model: TODO: remove .PHONY: generate-model-legacy diff --git a/doc/MIGRATION-v7.md b/doc/MIGRATION-v7.md index 0f97da83857..a1c7c8749ee 100644 --- a/doc/MIGRATION-v7.md +++ b/doc/MIGRATION-v7.md @@ -5,9 +5,11 @@ - [Apache Felix SCR Annotations removed](#apache-felix-scr-annotations) - [Model Changes](#model-changes) - [kubernetes-model artifact removed](#kubernetes-model-artifact-removed) + - [Moved packages](#model-changes-moved-packages) - [Service Catalog removed (operator.openshift.io)](#service-catalog-removed) + - [Removed deprecated types for network.openshift.io (OpenShift-SDN-only)](#openshift-network-removed) - [Deprecations and Removals](#deprecations-and-removals) - - [Service Catalog API removed](#service-catalog) + - [Service Catalog API (extension) removed](#service-catalog-extension) > [!NOTE] @@ -37,6 +39,10 @@ The Maven artifact `io.fabric8:kubernetes-model` has been removed from the proje This artifact was just an aggregator of _some_ of the Kubernetes model artifacts and had no specific purpose. It is no longer published, the `io.fabric8:kubernetes-client-api` or `io.fabric8:kubernetes-openshift-uberjar` artifacts should be used instead. +### Moved packages + +Some of the types and packages have been moved to more suiting modules and package names. + ### Service Catalog removed (operator.openshift.io) The operator.openshift.io APIs have been deprecated since OpenShift 4.1. @@ -44,9 +50,28 @@ The model types and DSL entry points for these APIs have been removed from the O - [openshift/api: remove the service catalog crds](https://github.com/openshift/api/pull/596) - [OpenShift Container Platform 4.1 release notes](https://docs.openshift.com/container-platform/4.1/release_notes/ocp-4-1-release-notes.html#ocp-4-1-service-broker-service-catalog-deprecation) +### Removed deprecated types for network.openshift.io (OpenShift-SDN-only) + +Some of the types in the `network.openshift.io` API group have been removed. +From the remaining types some of them have been moved to more appropriate modules. +- [openshift/api: clean up openshift-sdn references in the API](https://github.com/openshift/api/pull/1981) + +The removed types include: +- ClusterNetwork (`OpenShiftClient.clusterNetworks`) +- EgressNetworkPolicy (`OpenShiftClient.egressNetworkPolicies`) +- HostSubnet (`OpenShiftClient.hostSubnets`) +- NetNamespace (`OpenShiftClient.netNamespaces`) + +The moved types include: +- Config (io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1.Config) (`openshift-model-operator`) +- EgressRouter (`openshift-model-operator`) +- HelmChartRepository (`openshift-model-miscellaneous`) +- OperatorPKI (`openshift-model-operator`) +- ProjectHelmChartRepository (`openshift-model-miscellaneous`) + ## Deprecations and Removals -### Service Catalog API removed +### Service Catalog API (extension) removed The Service Catalog API extension has been removed. The upstream project has been archived since May 6, 2022. diff --git a/kubernetes-model-generator/generateModel.sh b/kubernetes-model-generator/generateModel.sh index fcab9bdc133..1c33802cfa0 100755 --- a/kubernetes-model-generator/generateModel.sh +++ b/kubernetes-model-generator/generateModel.sh @@ -22,7 +22,6 @@ ABSOLUTE_BASEDIR=$(realpath "$BASEDIR") # Array for all existing modules declare -a modules=( - "openshift-model" "openshift-model-operatorhub" "openshift-model-console" "openshift-model-clusterautoscaling" @@ -30,7 +29,6 @@ declare -a modules=( "openshift-model-machine" "openshift-model-installer" "openshift-model-machineconfig" - "openshift-model-miscellaneous" "openshift-model-monitoring" "openshift-model-tuned" "openshift-model-whereabouts" diff --git a/kubernetes-model-generator/openapi/generator/go.mod b/kubernetes-model-generator/openapi/generator/go.mod index 34216d94249..a172a21dfdc 100644 --- a/kubernetes-model-generator/openapi/generator/go.mod +++ b/kubernetes-model-generator/openapi/generator/go.mod @@ -4,6 +4,7 @@ go 1.22.0 require ( github.com/getkin/kin-openapi v0.125.0 + github.com/openshift/api v0.0.0-20240911192208-3e5de946111c k8s.io/api v0.30.2 k8s.io/apiextensions-apiserver v0.30.2 k8s.io/apimachinery v0.30.2 diff --git a/kubernetes-model-generator/openapi/generator/go.sum b/kubernetes-model-generator/openapi/generator/go.sum index 511c3d28ce4..a7f147b817b 100644 --- a/kubernetes-model-generator/openapi/generator/go.sum +++ b/kubernetes-model-generator/openapi/generator/go.sum @@ -55,6 +55,8 @@ github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= +github.com/openshift/api v0.0.0-20240911192208-3e5de946111c h1:46hH/7XmmaPmeJWTyrzh8TRB6I7TCwzJdxxWeyK8blM= +github.com/openshift/api v0.0.0-20240911192208-3e5de946111c/go.mod h1:OOh6Qopf21pSzqNVCB5gomomBXb8o5sGKZxG2KNpaXM= github.com/perimeterx/marshmallow v1.1.5 h1:a2LALqQ1BlHM8PZblsDdidgv1mWi1DgC2UmX50IvK2s= github.com/perimeterx/marshmallow v1.1.5/go.mod h1:dsXbUu8CRzfYP5a87xpp0xq9S3u0Vchtcl8we9tYaXw= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= diff --git a/kubernetes-model-generator/openapi/generator/main.go b/kubernetes-model-generator/openapi/generator/main.go index c57975f3896..03abc53883f 100644 --- a/kubernetes-model-generator/openapi/generator/main.go +++ b/kubernetes-model-generator/openapi/generator/main.go @@ -17,6 +17,8 @@ package main import ( "github.com/getkin/kin-openapi/openapi3" + openshiftauthorizationv1 "github.com/openshift/api/authorization/v1" + openshiftsecurityv1 "github.com/openshift/api/security/v1" admissionV1 "k8s.io/api/admission/v1" admissionV1Beta1 "k8s.io/api/admission/v1beta1" admissionregistrationV1 "k8s.io/api/admissionregistration/v1" @@ -134,6 +136,15 @@ func main() { reflect.TypeOf(metricsV1Beta1.PodMetricsList{}): {true, metricsV1Beta1.SchemeGroupVersion.String(), "pods", true}, reflect.TypeOf(metricsV1Beta1.PodMetrics{}): {false, metricsV1Beta1.SchemeGroupVersion.String(), "pods", true}, }, "metrics"), + NewTypeSchema([]reflect.Type{ + reflect.TypeOf(openshiftauthorizationv1.SubjectAccessReviewResponse{}), + reflect.TypeOf(openshiftauthorizationv1.ResourceAccessReviewResponse{}), + }, "openshift-authorization"), + // OpenAPI spec contains incomplete information for SecurityContextConstraints (only nested inline until certain level) + NewPathSchema(map[reflect.Type]ApiVersion{ + reflect.TypeOf(openshiftsecurityv1.SecurityContextConstraintsList{}): {true, openshiftsecurityv1.GroupVersion.String(), "securitycontextconstraints", false}, + reflect.TypeOf(openshiftsecurityv1.SecurityContextConstraints{}): {false, openshiftsecurityv1.GroupVersion.String(), "securitycontextconstraints", false}, + }, "openshift-security"), } generate(schemas, targetDirectory) } diff --git a/kubernetes-model-generator/openapi/maven-plugin/src/main/java/io/fabric8/kubernetes/schema/generator/model/ModelGenerator.java b/kubernetes-model-generator/openapi/maven-plugin/src/main/java/io/fabric8/kubernetes/schema/generator/model/ModelGenerator.java index 0e87c087d2c..9a66a109b75 100644 --- a/kubernetes-model-generator/openapi/maven-plugin/src/main/java/io/fabric8/kubernetes/schema/generator/model/ModelGenerator.java +++ b/kubernetes-model-generator/openapi/maven-plugin/src/main/java/io/fabric8/kubernetes/schema/generator/model/ModelGenerator.java @@ -106,8 +106,13 @@ private void processTemplate(TemplateContext ret) { if (ret.getApiVersion() != null) { ret.addImport("io.fabric8.kubernetes.model.annotation.Version"); ret.put("version", ret.getApiVersion().getVersion()); - ret.addImport("io.fabric8.kubernetes.model.annotation.Group"); - ret.put("group", ret.getApiVersion().getGroup()); + // TODO: we might want to generify this logic for other annotations and imports + if (Objects.equals("Group", ret.getClassSimpleName())) { + ret.put("group", "@io.fabric8.kubernetes.model.annotation.Group(\"" + ret.getApiVersion().getGroup() + "\")"); + } else { + ret.addImport("io.fabric8.kubernetes.model.annotation.Group"); + ret.put("group", "@Group(\"" + ret.getApiVersion().getGroup() + "\")"); + } ret.addImport("io.sundr.transform.annotations.TemplateTransformation"); ret.addImport("io.sundr.transform.annotations.TemplateTransformations"); ret.put("kubernetesResourceClass", settings.getKubernetesResourceClass()); diff --git a/kubernetes-model-generator/openapi/maven-plugin/src/main/java/io/fabric8/kubernetes/schema/generator/model/TemplateContext.java b/kubernetes-model-generator/openapi/maven-plugin/src/main/java/io/fabric8/kubernetes/schema/generator/model/TemplateContext.java index 58933d24449..8bbc4a7b1d7 100644 --- a/kubernetes-model-generator/openapi/maven-plugin/src/main/java/io/fabric8/kubernetes/schema/generator/model/TemplateContext.java +++ b/kubernetes-model-generator/openapi/maven-plugin/src/main/java/io/fabric8/kubernetes/schema/generator/model/TemplateContext.java @@ -67,4 +67,5 @@ void put(String key, Object value) { Map getSchemaProperties() { return classSchema.getProperties() == null ? Collections.emptyMap() : classSchema.getProperties(); } + } diff --git a/kubernetes-model-generator/openapi/maven-plugin/src/main/java/io/fabric8/kubernetes/schema/generator/schema/SchemaUtils.java b/kubernetes-model-generator/openapi/maven-plugin/src/main/java/io/fabric8/kubernetes/schema/generator/schema/SchemaUtils.java index fb1ec411a12..27e227757b1 100644 --- a/kubernetes-model-generator/openapi/maven-plugin/src/main/java/io/fabric8/kubernetes/schema/generator/schema/SchemaUtils.java +++ b/kubernetes-model-generator/openapi/maven-plugin/src/main/java/io/fabric8/kubernetes/schema/generator/schema/SchemaUtils.java @@ -108,6 +108,8 @@ public class SchemaUtils { "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaPropsOrStringArraySerDe.Deserializer.class"); JAVA_CLASS_DESERIALIZER_MAP.put("io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaPropsOrStringArray", "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaPropsOrStringArraySerDe.Deserializer.class"); + JAVA_CLASS_DESERIALIZER_MAP.put("io.fabric8.openshift.api.model.Template", + "io.fabric8.openshift.api.model.TemplateDeserializer.class"); } private static final Map REF_SERIALIZER_MAP = Collections.emptyMap();// new LinkedHashMap<>(); diff --git a/kubernetes-model-generator/openapi/maven-plugin/src/main/resources/templates/model_class_annotations.mustache b/kubernetes-model-generator/openapi/maven-plugin/src/main/resources/templates/model_class_annotations.mustache index 156b0877996..94780b19c26 100644 --- a/kubernetes-model-generator/openapi/maven-plugin/src/main/resources/templates/model_class_annotations.mustache +++ b/kubernetes-model-generator/openapi/maven-plugin/src/main/resources/templates/model_class_annotations.mustache @@ -57,6 +57,6 @@ @Version("{{.}}") {{/version}} {{#group}} -@Group("{{.}}") +{{.}} {{/group}} @Generated("jsonschema2pojo") diff --git a/kubernetes-model-generator/openapi/schemas/openshift-authorization.json b/kubernetes-model-generator/openapi/schemas/openshift-authorization.json new file mode 100644 index 00000000000..15bd01751e1 --- /dev/null +++ b/kubernetes-model-generator/openapi/schemas/openshift-authorization.json @@ -0,0 +1 @@ +{"components":{"schemas":{"com.github.openshift.api.authorization.v1.ResourceAccessReviewResponse":{"properties":{"apiVersion":{"type":"string"},"evalutionError":{"type":"string"},"groups":{"items":{"type":"string"},"type":"array"},"kind":{"type":"string"},"namespace":{"type":"string"},"users":{"items":{"type":"string"},"type":"array"}},"type":"object"},"com.github.openshift.api.authorization.v1.SubjectAccessReviewResponse":{"properties":{"allowed":{"type":"boolean"},"apiVersion":{"type":"string"},"evaluationError":{"type":"string"},"kind":{"type":"string"},"namespace":{"type":"string"},"reason":{"type":"string"}},"type":"object"}}},"info":{"title":"openshift-authorization","version":"0.0.0"},"openapi":"3.0.0","paths":{}} \ No newline at end of file diff --git a/kubernetes-model-generator/openapi/schemas/openshift-security.json b/kubernetes-model-generator/openapi/schemas/openshift-security.json new file mode 100644 index 00000000000..b448137d001 --- /dev/null +++ b/kubernetes-model-generator/openapi/schemas/openshift-security.json @@ -0,0 +1 @@ +{"components":{"schemas":{"com.github.openshift.api.security.v1.AllowedFlexVolume":{"properties":{"driver":{"type":"string"}},"type":"object"},"com.github.openshift.api.security.v1.FSGroupStrategyOptions":{"properties":{"ranges":{"items":{"$ref":"#/components/schemas/com.github.openshift.api.security.v1.IDRange"},"type":"array"},"type":{"type":"string"}},"type":"object"},"com.github.openshift.api.security.v1.IDRange":{"properties":{"max":{"format":"int64","type":"integer"},"min":{"format":"int64","type":"integer"}},"type":"object"},"com.github.openshift.api.security.v1.RunAsUserStrategyOptions":{"properties":{"type":{"type":"string"},"uid":{"format":"int64","type":"integer"},"uidRangeMax":{"format":"int64","type":"integer"},"uidRangeMin":{"format":"int64","type":"integer"}},"type":"object"},"com.github.openshift.api.security.v1.SELinuxContextStrategyOptions":{"properties":{"seLinuxOptions":{"$ref":"#/components/schemas/io.k8s.api.core.v1.SELinuxOptions"},"type":{"type":"string"}},"type":"object"},"com.github.openshift.api.security.v1.SecurityContextConstraints":{"properties":{"allowHostDirVolumePlugin":{"type":"boolean"},"allowHostIPC":{"type":"boolean"},"allowHostNetwork":{"type":"boolean"},"allowHostPID":{"type":"boolean"},"allowHostPorts":{"type":"boolean"},"allowPrivilegeEscalation":{"type":"boolean"},"allowPrivilegedContainer":{"type":"boolean"},"allowedCapabilities":{"items":{"type":"string"},"type":"array"},"allowedFlexVolumes":{"items":{"$ref":"#/components/schemas/com.github.openshift.api.security.v1.AllowedFlexVolume"},"type":"array"},"allowedUnsafeSysctls":{"items":{"type":"string"},"type":"array"},"apiVersion":{"type":"string"},"defaultAddCapabilities":{"items":{"type":"string"},"type":"array"},"defaultAllowPrivilegeEscalation":{"type":"boolean"},"forbiddenSysctls":{"items":{"type":"string"},"type":"array"},"fsGroup":{"$ref":"#/components/schemas/com.github.openshift.api.security.v1.FSGroupStrategyOptions"},"groups":{"items":{"type":"string"},"type":"array"},"kind":{"type":"string"},"metadata":{"$ref":"#/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta"},"priority":{"format":"int32","type":"integer"},"readOnlyRootFilesystem":{"type":"boolean"},"requiredDropCapabilities":{"items":{"type":"string"},"type":"array"},"runAsUser":{"$ref":"#/components/schemas/com.github.openshift.api.security.v1.RunAsUserStrategyOptions"},"seLinuxContext":{"$ref":"#/components/schemas/com.github.openshift.api.security.v1.SELinuxContextStrategyOptions"},"seccompProfiles":{"items":{"type":"string"},"type":"array"},"supplementalGroups":{"$ref":"#/components/schemas/com.github.openshift.api.security.v1.SupplementalGroupsStrategyOptions"},"userNamespaceLevel":{"type":"string"},"users":{"items":{"type":"string"},"type":"array"},"volumes":{"items":{"type":"string"},"type":"array"}},"type":"object"},"com.github.openshift.api.security.v1.SecurityContextConstraintsList":{"properties":{"apiVersion":{"type":"string"},"items":{"items":{"$ref":"#/components/schemas/com.github.openshift.api.security.v1.SecurityContextConstraints"},"type":"array"},"kind":{"type":"string"},"metadata":{"$ref":"#/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta"}},"type":"object"},"com.github.openshift.api.security.v1.SupplementalGroupsStrategyOptions":{"properties":{"ranges":{"items":{"$ref":"#/components/schemas/com.github.openshift.api.security.v1.IDRange"},"type":"array"},"type":{"type":"string"}},"type":"object"},"io.k8s.api.core.v1.SELinuxOptions":{"properties":{"level":{"type":"string"},"role":{"type":"string"},"type":{"type":"string"},"user":{"type":"string"}},"type":"object"},"io.k8s.apimachinery.pkg.apis.meta.v1.FieldsV1":{"properties":{"-":{"type":"string"}},"type":"object"},"io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta":{"properties":{"continue":{"type":"string"},"remainingItemCount":{"format":"int64","type":"integer"},"resourceVersion":{"type":"string"},"selfLink":{"type":"string"}},"type":"object"},"io.k8s.apimachinery.pkg.apis.meta.v1.ManagedFieldsEntry":{"properties":{"apiVersion":{"type":"string"},"fieldsType":{"type":"string"},"fieldsV1":{"$ref":"#/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.FieldsV1"},"manager":{"type":"string"},"operation":{"type":"string"},"subresource":{"type":"string"},"time":{"$ref":"#/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.Time"}},"type":"object"},"io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta":{"properties":{"annotations":{"additionalProperties":{"type":"string"},"type":"object"},"creationTimestamp":{"$ref":"#/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.Time"},"deletionGracePeriodSeconds":{"format":"int64","type":"integer"},"deletionTimestamp":{"$ref":"#/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.Time"},"finalizers":{"items":{"type":"string"},"type":"array"},"generateName":{"type":"string"},"generation":{"format":"int64","type":"integer"},"labels":{"additionalProperties":{"type":"string"},"type":"object"},"managedFields":{"items":{"$ref":"#/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.ManagedFieldsEntry"},"type":"array"},"name":{"type":"string"},"namespace":{"type":"string"},"ownerReferences":{"items":{"$ref":"#/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.OwnerReference"},"type":"array"},"resourceVersion":{"type":"string"},"selfLink":{"type":"string"},"uid":{"type":"string"}},"type":"object"},"io.k8s.apimachinery.pkg.apis.meta.v1.OwnerReference":{"properties":{"apiVersion":{"type":"string"},"blockOwnerDeletion":{"type":"boolean"},"controller":{"type":"boolean"},"kind":{"type":"string"},"name":{"type":"string"},"uid":{"type":"string"}},"type":"object"},"io.k8s.apimachinery.pkg.apis.meta.v1.Time":{"properties":{"Time":{"type":"string"}},"type":"object"}}},"info":{"title":"openshift-security","version":"0.0.0"},"openapi":"3.0.0","paths":{"/apis/security.openshift.io/v1/securitycontextconstraints":{"get":{"responses":{"200":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/com.github.openshift.api.security.v1.SecurityContextConstraintsList"}}},"description":"OK"},"default":{"description":""}},"x-kubernetes-group-version-kind":{"group":"security.openshift.io","kind":"SecurityContextConstraintsList","version":"v1"}}},"/apis/security.openshift.io/v1/securitycontextconstraints/{name}":{"get":{"parameters":[{"in":"path","name":"name","required":true}],"responses":{"200":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/com.github.openshift.api.security.v1.SecurityContextConstraints"}}},"description":"OK"},"default":{"description":""}},"x-kubernetes-group-version-kind":{"group":"security.openshift.io","kind":"SecurityContextConstraints","version":"v1"}}}}} \ No newline at end of file diff --git a/kubernetes-model-generator/openshift-model-hive/pom.xml b/kubernetes-model-generator/openshift-model-hive/pom.xml index 37d5c1c8399..d63b369f853 100644 --- a/kubernetes-model-generator/openshift-model-hive/pom.xml +++ b/kubernetes-model-generator/openshift-model-hive/pom.xml @@ -55,6 +55,10 @@ io.fabric8 openshift-model + + io.fabric8 + openshift-model-config + org.assertj assertj-core diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/Makefile b/kubernetes-model-generator/openshift-model-miscellaneous/Makefile deleted file mode 100644 index c09a7003874..00000000000 --- a/kubernetes-model-generator/openshift-model-miscellaneous/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# -# 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. -# - -SHELL := /bin/bash - -all: build - -build: gobuild - mvn -Pgenerate clean install -DskipTests - -gobuild: - CGO_ENABLED=0 GO15VENDOREXPERIMENT=1 go build -a ./cmd/generate/generate.go - ./generate > src/main/resources/schema/kube-schema.json - ./generate validation > src/main/resources/schema/validation-schema.json diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/cmd/generate/generate.go b/kubernetes-model-generator/openshift-model-miscellaneous/cmd/generate/generate.go deleted file mode 100644 index ec6c568c7e9..00000000000 --- a/kubernetes-model-generator/openshift-model-miscellaneous/cmd/generate/generate.go +++ /dev/null @@ -1,130 +0,0 @@ -/** - * 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 main - -import ( - "bytes" - "encoding/json" - "fmt" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - runtime "k8s.io/apimachinery/pkg/runtime" - apimachineryversion "k8s.io/apimachinery/pkg/version" - "log" - "reflect" - "strings" - "time" - - networkattachment "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1" - baremetal "github.com/metal3-io/baremetal-operator/apis/metal3.io/v1alpha1" - v1beta1_clusterapiprovidermetal3 "github.com/metal3-io/cluster-api-provider-metal3/api/v1beta1" - apiserver "github.com/openshift/api/apiserver/v1" - imageregistry "github.com/openshift/api/imageregistry/v1" - networkoperator "github.com/openshift/api/networkoperator/v1" - operatorv1 "github.com/openshift/api/operator/v1" - cloudcredential "github.com/openshift/cloud-credential-operator/pkg/apis/cloudcredential/v1" - clusternetworkoperator "github.com/openshift/cluster-network-operator/pkg/apis/network/v1" - "os" - - "github.com/fabric8io/kubernetes-client/kubernetes-model-generator/pkg/schemagen" -) - -type Schema struct { - Info apimachineryversion.Info - APIGroup metav1.APIGroup - APIGroupList metav1.APIGroupList - BaseKubernetesList metav1.List - ObjectMeta metav1.ObjectMeta - TypeMeta metav1.TypeMeta - Status metav1.Status - Patch metav1.Patch - Time metav1.Time - CredentialsRequest cloudcredential.CredentialsRequest - CredentialsRequestList cloudcredential.CredentialsRequestList - NetworkAttachmentDefinition networkattachment.NetworkAttachmentDefinition - NetworkAttachmentDefinitionList networkattachment.NetworkAttachmentDefinitionList - BareMetalHost baremetal.BareMetalHost - BareMetalHostList baremetal.BareMetalHostList - OperatorPKI clusternetworkoperator.OperatorPKI - OperatorPKIList clusternetworkoperator.OperatorPKIList - EgressRouter networkoperator.EgressRouter - EgressRouterList networkoperator.EgressRouterList - Config imageregistry.Config - ConfigList imageregistry.ConfigList - APIRequestCount apiserver.APIRequestCount - APIRequestCountList apiserver.APIRequestCountList - Metal3Remediation v1beta1_clusterapiprovidermetal3.Metal3Remediation - Metal3RemediationList v1beta1_clusterapiprovidermetal3.Metal3RemediationList - Metal3RemediationTemplate v1beta1_clusterapiprovidermetal3.Metal3RemediationTemplate - Metal3RemediationTemplateList v1beta1_clusterapiprovidermetal3.Metal3RemediationTemplateList -} - -func main() { - packages := []schemagen.PackageDescriptor{ - {"k8s.io/api/core/v1", "", "io.fabric8.kubernetes.api.model", "kubernetes_core_", false}, - {"k8s.io/apimachinery/pkg/api/resource", "", "io.fabric8.kubernetes.api.model", "kubernetes_resource_", false}, - {"k8s.io/apimachinery/pkg/util/intstr", "", "io.fabric8.kubernetes.api.model", "kubernetes_apimachinery_pkg_util_intstr_", false}, - {"k8s.io/apimachinery/pkg/runtime", "", "io.fabric8.openshift.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/kubernetes/pkg/util", "", "io.fabric8.kubernetes.api.model", "kubernetes_util_", false}, - {"k8s.io/kubernetes/pkg/api/errors", "", "io.fabric8.kubernetes.api.model", "kubernetes_errors_", false}, - {"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/config/v1", "", "io.fabric8.openshift.api.model", "os_config_v1_", false}, - {"github.com/openshift/cloud-credential-operator/pkg/apis/cloudcredential/v1", "cloudcredential", "io.fabric8.openshift.api.model.miscellaneous.cloudcredential.v1", "os_cloudcredential_v1_", true}, - {"github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1", "k8s.cni.cncf.io", "io.fabric8.openshift.api.model.miscellaneous.cncf.cni.v1", "os_cncf_cni_v1_", true}, - {"github.com/metal3-io/baremetal-operator/apis/metal3.io/v1alpha1", "metal3.io", "io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1", "os_metal3_v1alpha1_", true}, - {"github.com/metal3-io/cluster-api-provider-metal3/api/v1beta1", "infrastructure.cluster.x-k8s.io", "io.fabric8.openshift.api.model.miscellaneous.metal3.v1beta1", "os_metal3_v1beta1_", true}, - {"github.com/openshift/cluster-network-operator/pkg/apis/network/v1", "network.operator", "io.fabric8.openshift.api.model.miscellaneous.network.operator.v1", "os_network_operator_v1_", true}, - {"github.com/openshift/api/networkoperator/v1", "network.operator", "io.fabric8.openshift.api.model.miscellaneous.network.operator.v1", "os_network_operator_v1_", true}, - {"github.com/openshift/api/imageregistry/v1", "imageregistry.operator", "io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1", "os_imageregistry_v1_", true}, - {"github.com/openshift/api/apiserver/v1", "apiserver", "io.fabric8.openshift.api.model.miscellaneous.apiserver.v1", "os_apiserver_v1_", true}, - } - - typeMap := map[reflect.Type]reflect.Type{ - reflect.TypeOf(time.Time{}): reflect.TypeOf(""), - reflect.TypeOf(struct{}{}): reflect.TypeOf(""), - } - manualTypeMap := map[reflect.Type]string{ - reflect.TypeOf(runtime.RawExtension{}): "java.util.Map", - reflect.TypeOf(operatorv1.GenerationStatus{}): "io.fabric8.openshift.api.model.operator.v1.AuthenticationStatusGenerations", - reflect.TypeOf(operatorv1.OperatorCondition{}): "io.fabric8.openshift.api.model.operator.v1.AuthenticationStatusConditions", - } - schema, err := schemagen.GenerateSchema(reflect.TypeOf(Schema{}), packages, typeMap, manualTypeMap, "miscellaneous") - if err != nil { - fmt.Fprintf(os.Stderr, "An error occurred: %v", err) - return - } - - args := os.Args[1:] - if len(args) < 1 || args[0] != "validation" { - schema.Resources = nil - } - - b, err := json.Marshal(&schema) - if err != nil { - log.Fatal(err) - } - result := string(b) - result = strings.Replace(result, "\"additionalProperty\":", "\"additionalProperties\":", -1) - - var out bytes.Buffer - err = json.Indent(&out, []byte(result), "", " ") - if err != nil { - log.Fatal(err) - } - - fmt.Println(out.String()) -} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/pom.xml b/kubernetes-model-generator/openshift-model-miscellaneous/pom.xml index ba87d23cce8..b4e606836bb 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/pom.xml +++ b/kubernetes-model-generator/openshift-model-miscellaneous/pom.xml @@ -43,18 +43,6 @@ io.fabric8 kubernetes-model-core - - io.fabric8 - kubernetes-model-common - - - io.fabric8 - openshift-model - - - io.fabric8 - openshift-model-operator - org.assertj assertj-core @@ -62,31 +50,37 @@ - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifacts - - false - - - - - - - generate - org.jsonschema2pojo - jsonschema2pojo-maven-plugin + io.fabric8 + openapi-model-generator-maven-plugin + + + + ${openapi.schema.openshift-latest} + + + io.fabric8.kubernetes.api.model + io.fabric8.openshift.api.model.miscellaneous + io.fabric8.openshift.api.model.miscellaneous.cncf.cni + io.fabric8.openshift.api.model.miscellaneous.metal3 + io.fabric8.openshift.api.model.miscellaneous.metal3.v1beta1 + + + ^io\.cncf\.cni\.k8s\..*$ + ^io\.x\-k8s\.cluster\.infrastructure\.v1beta1\..*$ + ^io\.metal3\..*$ + ^io\.openshift\.apiserver\..*$ + ^io\.openshift\.cloudcredential\..*$ + ^io\.openshift\.helm\..*$ + ^io\.openshift\.network\..*$ + + + diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java deleted file mode 100644 index 050d9cbf9cb..00000000000 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ /dev/null @@ -1,386 +0,0 @@ - -package io.fabric8.kubernetes.api.model; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; -import io.fabric8.kubernetes.api.model.version.Info; -import io.fabric8.openshift.api.model.miscellaneous.apiserver.v1.APIRequestCount; -import io.fabric8.openshift.api.model.miscellaneous.apiserver.v1.APIRequestCountList; -import io.fabric8.openshift.api.model.miscellaneous.cloudcredential.v1.CredentialsRequest; -import io.fabric8.openshift.api.model.miscellaneous.cloudcredential.v1.CredentialsRequestList; -import io.fabric8.openshift.api.model.miscellaneous.cncf.cni.v1.NetworkAttachmentDefinition; -import io.fabric8.openshift.api.model.miscellaneous.cncf.cni.v1.NetworkAttachmentDefinitionList; -import io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1.Config; -import io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1.ConfigList; -import io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1.BareMetalHost; -import io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1.BareMetalHostList; -import io.fabric8.openshift.api.model.miscellaneous.metal3.v1beta1.Metal3Remediation; -import io.fabric8.openshift.api.model.miscellaneous.metal3.v1beta1.Metal3RemediationList; -import io.fabric8.openshift.api.model.miscellaneous.metal3.v1beta1.Metal3RemediationTemplate; -import io.fabric8.openshift.api.model.miscellaneous.metal3.v1beta1.Metal3RemediationTemplateList; -import io.fabric8.openshift.api.model.miscellaneous.network.operator.v1.EgressRouter; -import io.fabric8.openshift.api.model.miscellaneous.network.operator.v1.EgressRouterList; -import io.fabric8.openshift.api.model.miscellaneous.network.operator.v1.OperatorPKI; -import io.fabric8.openshift.api.model.miscellaneous.network.operator.v1.OperatorPKIList; - -@Generated("jsonschema2pojo") -public class KubeSchema { - - private APIGroup aPIGroup; - private APIGroupList aPIGroupList; - private APIRequestCount aPIRequestCount; - private APIRequestCountList aPIRequestCountList; - private BareMetalHost bareMetalHost; - private BareMetalHostList bareMetalHostList; - private KubernetesList baseKubernetesList; - private Config config; - private ConfigList configList; - private CredentialsRequest credentialsRequest; - private CredentialsRequestList credentialsRequestList; - private EgressRouter egressRouter; - private EgressRouterList egressRouterList; - private Info info; - private Metal3Remediation metal3Remediation; - private Metal3RemediationList metal3RemediationList; - private Metal3RemediationTemplate metal3RemediationTemplate; - private Metal3RemediationTemplateList metal3RemediationTemplateList; - private NetworkAttachmentDefinition networkAttachmentDefinition; - private NetworkAttachmentDefinitionList networkAttachmentDefinitionList; - private ObjectMeta objectMeta; - private OperatorPKI operatorPKI; - private OperatorPKIList operatorPKIList; - private Patch patch; - private Status status; - private String time; - private TypeMeta typeMeta; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public KubeSchema() { - } - - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, APIRequestCount aPIRequestCount, APIRequestCountList aPIRequestCountList, BareMetalHost bareMetalHost, BareMetalHostList bareMetalHostList, KubernetesList baseKubernetesList, Config config, ConfigList configList, CredentialsRequest credentialsRequest, CredentialsRequestList credentialsRequestList, EgressRouter egressRouter, EgressRouterList egressRouterList, Info info, Metal3Remediation metal3Remediation, Metal3RemediationList metal3RemediationList, Metal3RemediationTemplate metal3RemediationTemplate, Metal3RemediationTemplateList metal3RemediationTemplateList, NetworkAttachmentDefinition networkAttachmentDefinition, NetworkAttachmentDefinitionList networkAttachmentDefinitionList, ObjectMeta objectMeta, OperatorPKI operatorPKI, OperatorPKIList operatorPKIList, Patch patch, Status status, String time, TypeMeta typeMeta) { - super(); - this.aPIGroup = aPIGroup; - this.aPIGroupList = aPIGroupList; - this.aPIRequestCount = aPIRequestCount; - this.aPIRequestCountList = aPIRequestCountList; - this.bareMetalHost = bareMetalHost; - this.bareMetalHostList = bareMetalHostList; - this.baseKubernetesList = baseKubernetesList; - this.config = config; - this.configList = configList; - this.credentialsRequest = credentialsRequest; - this.credentialsRequestList = credentialsRequestList; - this.egressRouter = egressRouter; - this.egressRouterList = egressRouterList; - this.info = info; - this.metal3Remediation = metal3Remediation; - this.metal3RemediationList = metal3RemediationList; - this.metal3RemediationTemplate = metal3RemediationTemplate; - this.metal3RemediationTemplateList = metal3RemediationTemplateList; - this.networkAttachmentDefinition = networkAttachmentDefinition; - this.networkAttachmentDefinitionList = networkAttachmentDefinitionList; - this.objectMeta = objectMeta; - this.operatorPKI = operatorPKI; - this.operatorPKIList = operatorPKIList; - this.patch = patch; - this.status = status; - this.time = time; - this.typeMeta = typeMeta; - } - - @JsonProperty("APIGroup") - public APIGroup getAPIGroup() { - return aPIGroup; - } - - @JsonProperty("APIGroup") - public void setAPIGroup(APIGroup aPIGroup) { - this.aPIGroup = aPIGroup; - } - - @JsonProperty("APIGroupList") - public APIGroupList getAPIGroupList() { - return aPIGroupList; - } - - @JsonProperty("APIGroupList") - public void setAPIGroupList(APIGroupList aPIGroupList) { - this.aPIGroupList = aPIGroupList; - } - - @JsonProperty("APIRequestCount") - public APIRequestCount getAPIRequestCount() { - return aPIRequestCount; - } - - @JsonProperty("APIRequestCount") - public void setAPIRequestCount(APIRequestCount aPIRequestCount) { - this.aPIRequestCount = aPIRequestCount; - } - - @JsonProperty("APIRequestCountList") - public APIRequestCountList getAPIRequestCountList() { - return aPIRequestCountList; - } - - @JsonProperty("APIRequestCountList") - public void setAPIRequestCountList(APIRequestCountList aPIRequestCountList) { - this.aPIRequestCountList = aPIRequestCountList; - } - - @JsonProperty("BareMetalHost") - public BareMetalHost getBareMetalHost() { - return bareMetalHost; - } - - @JsonProperty("BareMetalHost") - public void setBareMetalHost(BareMetalHost bareMetalHost) { - this.bareMetalHost = bareMetalHost; - } - - @JsonProperty("BareMetalHostList") - public BareMetalHostList getBareMetalHostList() { - return bareMetalHostList; - } - - @JsonProperty("BareMetalHostList") - public void setBareMetalHostList(BareMetalHostList bareMetalHostList) { - this.bareMetalHostList = bareMetalHostList; - } - - @JsonProperty("BaseKubernetesList") - public KubernetesList getBaseKubernetesList() { - return baseKubernetesList; - } - - @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(KubernetesList baseKubernetesList) { - this.baseKubernetesList = baseKubernetesList; - } - - @JsonProperty("Config") - public Config getConfig() { - return config; - } - - @JsonProperty("Config") - public void setConfig(Config config) { - this.config = config; - } - - @JsonProperty("ConfigList") - public ConfigList getConfigList() { - return configList; - } - - @JsonProperty("ConfigList") - public void setConfigList(ConfigList configList) { - this.configList = configList; - } - - @JsonProperty("CredentialsRequest") - public CredentialsRequest getCredentialsRequest() { - return credentialsRequest; - } - - @JsonProperty("CredentialsRequest") - public void setCredentialsRequest(CredentialsRequest credentialsRequest) { - this.credentialsRequest = credentialsRequest; - } - - @JsonProperty("CredentialsRequestList") - public CredentialsRequestList getCredentialsRequestList() { - return credentialsRequestList; - } - - @JsonProperty("CredentialsRequestList") - public void setCredentialsRequestList(CredentialsRequestList credentialsRequestList) { - this.credentialsRequestList = credentialsRequestList; - } - - @JsonProperty("EgressRouter") - public EgressRouter getEgressRouter() { - return egressRouter; - } - - @JsonProperty("EgressRouter") - public void setEgressRouter(EgressRouter egressRouter) { - this.egressRouter = egressRouter; - } - - @JsonProperty("EgressRouterList") - public EgressRouterList getEgressRouterList() { - return egressRouterList; - } - - @JsonProperty("EgressRouterList") - public void setEgressRouterList(EgressRouterList egressRouterList) { - this.egressRouterList = egressRouterList; - } - - @JsonProperty("Info") - public Info getInfo() { - return info; - } - - @JsonProperty("Info") - public void setInfo(Info info) { - this.info = info; - } - - @JsonProperty("Metal3Remediation") - public Metal3Remediation getMetal3Remediation() { - return metal3Remediation; - } - - @JsonProperty("Metal3Remediation") - public void setMetal3Remediation(Metal3Remediation metal3Remediation) { - this.metal3Remediation = metal3Remediation; - } - - @JsonProperty("Metal3RemediationList") - public Metal3RemediationList getMetal3RemediationList() { - return metal3RemediationList; - } - - @JsonProperty("Metal3RemediationList") - public void setMetal3RemediationList(Metal3RemediationList metal3RemediationList) { - this.metal3RemediationList = metal3RemediationList; - } - - @JsonProperty("Metal3RemediationTemplate") - public Metal3RemediationTemplate getMetal3RemediationTemplate() { - return metal3RemediationTemplate; - } - - @JsonProperty("Metal3RemediationTemplate") - public void setMetal3RemediationTemplate(Metal3RemediationTemplate metal3RemediationTemplate) { - this.metal3RemediationTemplate = metal3RemediationTemplate; - } - - @JsonProperty("Metal3RemediationTemplateList") - public Metal3RemediationTemplateList getMetal3RemediationTemplateList() { - return metal3RemediationTemplateList; - } - - @JsonProperty("Metal3RemediationTemplateList") - public void setMetal3RemediationTemplateList(Metal3RemediationTemplateList metal3RemediationTemplateList) { - this.metal3RemediationTemplateList = metal3RemediationTemplateList; - } - - @JsonProperty("NetworkAttachmentDefinition") - public NetworkAttachmentDefinition getNetworkAttachmentDefinition() { - return networkAttachmentDefinition; - } - - @JsonProperty("NetworkAttachmentDefinition") - public void setNetworkAttachmentDefinition(NetworkAttachmentDefinition networkAttachmentDefinition) { - this.networkAttachmentDefinition = networkAttachmentDefinition; - } - - @JsonProperty("NetworkAttachmentDefinitionList") - public NetworkAttachmentDefinitionList getNetworkAttachmentDefinitionList() { - return networkAttachmentDefinitionList; - } - - @JsonProperty("NetworkAttachmentDefinitionList") - public void setNetworkAttachmentDefinitionList(NetworkAttachmentDefinitionList networkAttachmentDefinitionList) { - this.networkAttachmentDefinitionList = networkAttachmentDefinitionList; - } - - @JsonProperty("ObjectMeta") - public ObjectMeta getObjectMeta() { - return objectMeta; - } - - @JsonProperty("ObjectMeta") - public void setObjectMeta(ObjectMeta objectMeta) { - this.objectMeta = objectMeta; - } - - @JsonProperty("OperatorPKI") - public OperatorPKI getOperatorPKI() { - return operatorPKI; - } - - @JsonProperty("OperatorPKI") - public void setOperatorPKI(OperatorPKI operatorPKI) { - this.operatorPKI = operatorPKI; - } - - @JsonProperty("OperatorPKIList") - public OperatorPKIList getOperatorPKIList() { - return operatorPKIList; - } - - @JsonProperty("OperatorPKIList") - public void setOperatorPKIList(OperatorPKIList operatorPKIList) { - this.operatorPKIList = operatorPKIList; - } - - @JsonProperty("Patch") - public Patch getPatch() { - return patch; - } - - @JsonProperty("Patch") - public void setPatch(Patch patch) { - this.patch = patch; - } - - @JsonProperty("Status") - public Status getStatus() { - return status; - } - - @JsonProperty("Status") - public void setStatus(Status status) { - this.status = status; - } - - @JsonProperty("Time") - public String getTime() { - return time; - } - - @JsonProperty("Time") - public void setTime(String time) { - this.time = time; - } - - @JsonProperty("TypeMeta") - public TypeMeta getTypeMeta() { - return typeMeta; - } - - @JsonProperty("TypeMeta") - public void setTypeMeta(TypeMeta typeMeta) { - this.typeMeta = typeMeta; - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java deleted file mode 100644 index 64da7c4fefe..00000000000 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ /dev/null @@ -1,386 +0,0 @@ - -package io.fabric8.kubernetes.api.model; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; -import io.fabric8.kubernetes.api.model.version.Info; -import io.fabric8.openshift.api.model.miscellaneous.apiserver.v1.APIRequestCount; -import io.fabric8.openshift.api.model.miscellaneous.apiserver.v1.APIRequestCountList; -import io.fabric8.openshift.api.model.miscellaneous.cloudcredential.v1.CredentialsRequest; -import io.fabric8.openshift.api.model.miscellaneous.cloudcredential.v1.CredentialsRequestList; -import io.fabric8.openshift.api.model.miscellaneous.cncf.cni.v1.NetworkAttachmentDefinition; -import io.fabric8.openshift.api.model.miscellaneous.cncf.cni.v1.NetworkAttachmentDefinitionList; -import io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1.Config; -import io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1.ConfigList; -import io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1.BareMetalHost; -import io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1.BareMetalHostList; -import io.fabric8.openshift.api.model.miscellaneous.metal3.v1beta1.Metal3Remediation; -import io.fabric8.openshift.api.model.miscellaneous.metal3.v1beta1.Metal3RemediationList; -import io.fabric8.openshift.api.model.miscellaneous.metal3.v1beta1.Metal3RemediationTemplate; -import io.fabric8.openshift.api.model.miscellaneous.metal3.v1beta1.Metal3RemediationTemplateList; -import io.fabric8.openshift.api.model.miscellaneous.network.operator.v1.EgressRouter; -import io.fabric8.openshift.api.model.miscellaneous.network.operator.v1.EgressRouterList; -import io.fabric8.openshift.api.model.miscellaneous.network.operator.v1.OperatorPKI; -import io.fabric8.openshift.api.model.miscellaneous.network.operator.v1.OperatorPKIList; - -@Generated("jsonschema2pojo") -public class ValidationSchema { - - private APIGroup aPIGroup; - private APIGroupList aPIGroupList; - private APIRequestCount aPIRequestCount; - private APIRequestCountList aPIRequestCountList; - private BareMetalHost bareMetalHost; - private BareMetalHostList bareMetalHostList; - private KubernetesList baseKubernetesList; - private Config config; - private ConfigList configList; - private CredentialsRequest credentialsRequest; - private CredentialsRequestList credentialsRequestList; - private EgressRouter egressRouter; - private EgressRouterList egressRouterList; - private Info info; - private Metal3Remediation metal3Remediation; - private Metal3RemediationList metal3RemediationList; - private Metal3RemediationTemplate metal3RemediationTemplate; - private Metal3RemediationTemplateList metal3RemediationTemplateList; - private NetworkAttachmentDefinition networkAttachmentDefinition; - private NetworkAttachmentDefinitionList networkAttachmentDefinitionList; - private ObjectMeta objectMeta; - private OperatorPKI operatorPKI; - private OperatorPKIList operatorPKIList; - private Patch patch; - private Status status; - private String time; - private TypeMeta typeMeta; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ValidationSchema() { - } - - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, APIRequestCount aPIRequestCount, APIRequestCountList aPIRequestCountList, BareMetalHost bareMetalHost, BareMetalHostList bareMetalHostList, KubernetesList baseKubernetesList, Config config, ConfigList configList, CredentialsRequest credentialsRequest, CredentialsRequestList credentialsRequestList, EgressRouter egressRouter, EgressRouterList egressRouterList, Info info, Metal3Remediation metal3Remediation, Metal3RemediationList metal3RemediationList, Metal3RemediationTemplate metal3RemediationTemplate, Metal3RemediationTemplateList metal3RemediationTemplateList, NetworkAttachmentDefinition networkAttachmentDefinition, NetworkAttachmentDefinitionList networkAttachmentDefinitionList, ObjectMeta objectMeta, OperatorPKI operatorPKI, OperatorPKIList operatorPKIList, Patch patch, Status status, String time, TypeMeta typeMeta) { - super(); - this.aPIGroup = aPIGroup; - this.aPIGroupList = aPIGroupList; - this.aPIRequestCount = aPIRequestCount; - this.aPIRequestCountList = aPIRequestCountList; - this.bareMetalHost = bareMetalHost; - this.bareMetalHostList = bareMetalHostList; - this.baseKubernetesList = baseKubernetesList; - this.config = config; - this.configList = configList; - this.credentialsRequest = credentialsRequest; - this.credentialsRequestList = credentialsRequestList; - this.egressRouter = egressRouter; - this.egressRouterList = egressRouterList; - this.info = info; - this.metal3Remediation = metal3Remediation; - this.metal3RemediationList = metal3RemediationList; - this.metal3RemediationTemplate = metal3RemediationTemplate; - this.metal3RemediationTemplateList = metal3RemediationTemplateList; - this.networkAttachmentDefinition = networkAttachmentDefinition; - this.networkAttachmentDefinitionList = networkAttachmentDefinitionList; - this.objectMeta = objectMeta; - this.operatorPKI = operatorPKI; - this.operatorPKIList = operatorPKIList; - this.patch = patch; - this.status = status; - this.time = time; - this.typeMeta = typeMeta; - } - - @JsonProperty("APIGroup") - public APIGroup getAPIGroup() { - return aPIGroup; - } - - @JsonProperty("APIGroup") - public void setAPIGroup(APIGroup aPIGroup) { - this.aPIGroup = aPIGroup; - } - - @JsonProperty("APIGroupList") - public APIGroupList getAPIGroupList() { - return aPIGroupList; - } - - @JsonProperty("APIGroupList") - public void setAPIGroupList(APIGroupList aPIGroupList) { - this.aPIGroupList = aPIGroupList; - } - - @JsonProperty("APIRequestCount") - public APIRequestCount getAPIRequestCount() { - return aPIRequestCount; - } - - @JsonProperty("APIRequestCount") - public void setAPIRequestCount(APIRequestCount aPIRequestCount) { - this.aPIRequestCount = aPIRequestCount; - } - - @JsonProperty("APIRequestCountList") - public APIRequestCountList getAPIRequestCountList() { - return aPIRequestCountList; - } - - @JsonProperty("APIRequestCountList") - public void setAPIRequestCountList(APIRequestCountList aPIRequestCountList) { - this.aPIRequestCountList = aPIRequestCountList; - } - - @JsonProperty("BareMetalHost") - public BareMetalHost getBareMetalHost() { - return bareMetalHost; - } - - @JsonProperty("BareMetalHost") - public void setBareMetalHost(BareMetalHost bareMetalHost) { - this.bareMetalHost = bareMetalHost; - } - - @JsonProperty("BareMetalHostList") - public BareMetalHostList getBareMetalHostList() { - return bareMetalHostList; - } - - @JsonProperty("BareMetalHostList") - public void setBareMetalHostList(BareMetalHostList bareMetalHostList) { - this.bareMetalHostList = bareMetalHostList; - } - - @JsonProperty("BaseKubernetesList") - public KubernetesList getBaseKubernetesList() { - return baseKubernetesList; - } - - @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(KubernetesList baseKubernetesList) { - this.baseKubernetesList = baseKubernetesList; - } - - @JsonProperty("Config") - public Config getConfig() { - return config; - } - - @JsonProperty("Config") - public void setConfig(Config config) { - this.config = config; - } - - @JsonProperty("ConfigList") - public ConfigList getConfigList() { - return configList; - } - - @JsonProperty("ConfigList") - public void setConfigList(ConfigList configList) { - this.configList = configList; - } - - @JsonProperty("CredentialsRequest") - public CredentialsRequest getCredentialsRequest() { - return credentialsRequest; - } - - @JsonProperty("CredentialsRequest") - public void setCredentialsRequest(CredentialsRequest credentialsRequest) { - this.credentialsRequest = credentialsRequest; - } - - @JsonProperty("CredentialsRequestList") - public CredentialsRequestList getCredentialsRequestList() { - return credentialsRequestList; - } - - @JsonProperty("CredentialsRequestList") - public void setCredentialsRequestList(CredentialsRequestList credentialsRequestList) { - this.credentialsRequestList = credentialsRequestList; - } - - @JsonProperty("EgressRouter") - public EgressRouter getEgressRouter() { - return egressRouter; - } - - @JsonProperty("EgressRouter") - public void setEgressRouter(EgressRouter egressRouter) { - this.egressRouter = egressRouter; - } - - @JsonProperty("EgressRouterList") - public EgressRouterList getEgressRouterList() { - return egressRouterList; - } - - @JsonProperty("EgressRouterList") - public void setEgressRouterList(EgressRouterList egressRouterList) { - this.egressRouterList = egressRouterList; - } - - @JsonProperty("Info") - public Info getInfo() { - return info; - } - - @JsonProperty("Info") - public void setInfo(Info info) { - this.info = info; - } - - @JsonProperty("Metal3Remediation") - public Metal3Remediation getMetal3Remediation() { - return metal3Remediation; - } - - @JsonProperty("Metal3Remediation") - public void setMetal3Remediation(Metal3Remediation metal3Remediation) { - this.metal3Remediation = metal3Remediation; - } - - @JsonProperty("Metal3RemediationList") - public Metal3RemediationList getMetal3RemediationList() { - return metal3RemediationList; - } - - @JsonProperty("Metal3RemediationList") - public void setMetal3RemediationList(Metal3RemediationList metal3RemediationList) { - this.metal3RemediationList = metal3RemediationList; - } - - @JsonProperty("Metal3RemediationTemplate") - public Metal3RemediationTemplate getMetal3RemediationTemplate() { - return metal3RemediationTemplate; - } - - @JsonProperty("Metal3RemediationTemplate") - public void setMetal3RemediationTemplate(Metal3RemediationTemplate metal3RemediationTemplate) { - this.metal3RemediationTemplate = metal3RemediationTemplate; - } - - @JsonProperty("Metal3RemediationTemplateList") - public Metal3RemediationTemplateList getMetal3RemediationTemplateList() { - return metal3RemediationTemplateList; - } - - @JsonProperty("Metal3RemediationTemplateList") - public void setMetal3RemediationTemplateList(Metal3RemediationTemplateList metal3RemediationTemplateList) { - this.metal3RemediationTemplateList = metal3RemediationTemplateList; - } - - @JsonProperty("NetworkAttachmentDefinition") - public NetworkAttachmentDefinition getNetworkAttachmentDefinition() { - return networkAttachmentDefinition; - } - - @JsonProperty("NetworkAttachmentDefinition") - public void setNetworkAttachmentDefinition(NetworkAttachmentDefinition networkAttachmentDefinition) { - this.networkAttachmentDefinition = networkAttachmentDefinition; - } - - @JsonProperty("NetworkAttachmentDefinitionList") - public NetworkAttachmentDefinitionList getNetworkAttachmentDefinitionList() { - return networkAttachmentDefinitionList; - } - - @JsonProperty("NetworkAttachmentDefinitionList") - public void setNetworkAttachmentDefinitionList(NetworkAttachmentDefinitionList networkAttachmentDefinitionList) { - this.networkAttachmentDefinitionList = networkAttachmentDefinitionList; - } - - @JsonProperty("ObjectMeta") - public ObjectMeta getObjectMeta() { - return objectMeta; - } - - @JsonProperty("ObjectMeta") - public void setObjectMeta(ObjectMeta objectMeta) { - this.objectMeta = objectMeta; - } - - @JsonProperty("OperatorPKI") - public OperatorPKI getOperatorPKI() { - return operatorPKI; - } - - @JsonProperty("OperatorPKI") - public void setOperatorPKI(OperatorPKI operatorPKI) { - this.operatorPKI = operatorPKI; - } - - @JsonProperty("OperatorPKIList") - public OperatorPKIList getOperatorPKIList() { - return operatorPKIList; - } - - @JsonProperty("OperatorPKIList") - public void setOperatorPKIList(OperatorPKIList operatorPKIList) { - this.operatorPKIList = operatorPKIList; - } - - @JsonProperty("Patch") - public Patch getPatch() { - return patch; - } - - @JsonProperty("Patch") - public void setPatch(Patch patch) { - this.patch = patch; - } - - @JsonProperty("Status") - public Status getStatus() { - return status; - } - - @JsonProperty("Status") - public void setStatus(Status status) { - this.status = status; - } - - @JsonProperty("Time") - public String getTime() { - return time; - } - - @JsonProperty("Time") - public void setTime(String time) { - this.time = time; - } - - @JsonProperty("TypeMeta") - public TypeMeta getTypeMeta() { - return typeMeta; - } - - @JsonProperty("TypeMeta") - public void setTypeMeta(TypeMeta typeMeta) { - this.typeMeta = typeMeta; - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/APIRequestCount.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/APIRequestCount.java index 1c3a0c14408..247ba3a9f82 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/APIRequestCount.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/APIRequestCount.java @@ -17,6 +17,7 @@ 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.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -47,7 +48,7 @@ "" }) @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(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @@ -81,7 +82,7 @@ public class APIRequestCount implements Editable , HasMe @JsonProperty("kind") private String kind = "APIRequestCount"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("spec") private APIRequestCountSpec spec; @JsonProperty("status") @@ -96,7 +97,7 @@ public class APIRequestCount implements Editable , HasMe public APIRequestCount() { } - public APIRequestCount(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, APIRequestCountSpec spec, APIRequestCountStatus status) { + public APIRequestCount(String apiVersion, String kind, ObjectMeta metadata, APIRequestCountSpec spec, APIRequestCountStatus status) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -146,12 +147,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/APIRequestCountStatus.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/APIRequestCountStatus.java index 49e7b34f2cf..66014e425df 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/APIRequestCountStatus.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/APIRequestCountStatus.java @@ -14,7 +14,6 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.fabric8.kubernetes.api.builder.Editable; -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; @@ -63,12 +62,12 @@ public class APIRequestCountStatus implements Editable conditions = new ArrayList<>(); + private List conditions = new ArrayList<>(); @JsonProperty("currentHour") - private PerResourceAPIRequestLog currentHour; + private APIRequestCountStatusCurrentHour currentHour; @JsonProperty("last24h") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List last24h = new ArrayList<>(); + private List last24h = new ArrayList<>(); @JsonProperty("removedInRelease") private String removedInRelease; @JsonProperty("requestCount") @@ -83,7 +82,7 @@ public class APIRequestCountStatus implements Editable conditions, PerResourceAPIRequestLog currentHour, List last24h, String removedInRelease, Long requestCount) { + public APIRequestCountStatus(List conditions, APIRequestCountStatusCurrentHour currentHour, List last24h, String removedInRelease, Long requestCount) { super(); this.conditions = conditions; this.currentHour = currentHour; @@ -94,33 +93,33 @@ public APIRequestCountStatus(List conditions, PerResourceAPIRequestLo @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getConditions() { + public List getConditions() { return conditions; } @JsonProperty("conditions") - public void setConditions(List conditions) { + public void setConditions(List conditions) { this.conditions = conditions; } @JsonProperty("currentHour") - public PerResourceAPIRequestLog getCurrentHour() { + public APIRequestCountStatusCurrentHour getCurrentHour() { return currentHour; } @JsonProperty("currentHour") - public void setCurrentHour(PerResourceAPIRequestLog currentHour) { + public void setCurrentHour(APIRequestCountStatusCurrentHour currentHour) { this.currentHour = currentHour; } @JsonProperty("last24h") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getLast24h() { + public List getLast24h() { return last24h; } @JsonProperty("last24h") - public void setLast24h(List last24h) { + public void setLast24h(List last24h) { this.last24h = last24h; } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/APIRequestCountStatusCHBNBUByVerb.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/APIRequestCountStatusCHBNBUByVerb.java new file mode 100644 index 00000000000..c1a6809b19f --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/APIRequestCountStatusCHBNBUByVerb.java @@ -0,0 +1,122 @@ + +package io.fabric8.openshift.api.model.miscellaneous.apiserver.v1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "requestCount", + "verb" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class APIRequestCountStatusCHBNBUByVerb implements Editable , KubernetesResource +{ + + @JsonProperty("requestCount") + private Long requestCount; + @JsonProperty("verb") + private String verb; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public APIRequestCountStatusCHBNBUByVerb() { + } + + public APIRequestCountStatusCHBNBUByVerb(Long requestCount, String verb) { + super(); + this.requestCount = requestCount; + this.verb = verb; + } + + @JsonProperty("requestCount") + public Long getRequestCount() { + return requestCount; + } + + @JsonProperty("requestCount") + public void setRequestCount(Long requestCount) { + this.requestCount = requestCount; + } + + @JsonProperty("verb") + public String getVerb() { + return verb; + } + + @JsonProperty("verb") + public void setVerb(String verb) { + this.verb = verb; + } + + @JsonIgnore + public APIRequestCountStatusCHBNBUByVerbBuilder edit() { + return new APIRequestCountStatusCHBNBUByVerbBuilder(this); + } + + @JsonIgnore + public APIRequestCountStatusCHBNBUByVerbBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/APIRequestCountStatusCHBNByUser.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/APIRequestCountStatusCHBNByUser.java new file mode 100644 index 00000000000..41534a2ba9e --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/APIRequestCountStatusCHBNByUser.java @@ -0,0 +1,154 @@ + +package io.fabric8.openshift.api.model.miscellaneous.apiserver.v1; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "byVerb", + "requestCount", + "userAgent", + "username" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class APIRequestCountStatusCHBNByUser implements Editable , KubernetesResource +{ + + @JsonProperty("byVerb") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List byVerb = new ArrayList<>(); + @JsonProperty("requestCount") + private Long requestCount; + @JsonProperty("userAgent") + private String userAgent; + @JsonProperty("username") + private String username; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public APIRequestCountStatusCHBNByUser() { + } + + public APIRequestCountStatusCHBNByUser(List byVerb, Long requestCount, String userAgent, String username) { + super(); + this.byVerb = byVerb; + this.requestCount = requestCount; + this.userAgent = userAgent; + this.username = username; + } + + @JsonProperty("byVerb") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getByVerb() { + return byVerb; + } + + @JsonProperty("byVerb") + public void setByVerb(List byVerb) { + this.byVerb = byVerb; + } + + @JsonProperty("requestCount") + public Long getRequestCount() { + return requestCount; + } + + @JsonProperty("requestCount") + public void setRequestCount(Long requestCount) { + this.requestCount = requestCount; + } + + @JsonProperty("userAgent") + public String getUserAgent() { + return userAgent; + } + + @JsonProperty("userAgent") + public void setUserAgent(String userAgent) { + this.userAgent = userAgent; + } + + @JsonProperty("username") + public String getUsername() { + return username; + } + + @JsonProperty("username") + public void setUsername(String username) { + this.username = username; + } + + @JsonIgnore + public APIRequestCountStatusCHBNByUserBuilder edit() { + return new APIRequestCountStatusCHBNByUserBuilder(this); + } + + @JsonIgnore + public APIRequestCountStatusCHBNByUserBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/APIRequestCountStatusCHByNode.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/APIRequestCountStatusCHByNode.java new file mode 100644 index 00000000000..72c44748ca4 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/APIRequestCountStatusCHByNode.java @@ -0,0 +1,140 @@ + +package io.fabric8.openshift.api.model.miscellaneous.apiserver.v1; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "byUser", + "nodeName", + "requestCount" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class APIRequestCountStatusCHByNode implements Editable , KubernetesResource +{ + + @JsonProperty("byUser") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List byUser = new ArrayList<>(); + @JsonProperty("nodeName") + private String nodeName; + @JsonProperty("requestCount") + private Long requestCount; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public APIRequestCountStatusCHByNode() { + } + + public APIRequestCountStatusCHByNode(List byUser, String nodeName, Long requestCount) { + super(); + this.byUser = byUser; + this.nodeName = nodeName; + this.requestCount = requestCount; + } + + @JsonProperty("byUser") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getByUser() { + return byUser; + } + + @JsonProperty("byUser") + public void setByUser(List byUser) { + this.byUser = byUser; + } + + @JsonProperty("nodeName") + public String getNodeName() { + return nodeName; + } + + @JsonProperty("nodeName") + public void setNodeName(String nodeName) { + this.nodeName = nodeName; + } + + @JsonProperty("requestCount") + public Long getRequestCount() { + return requestCount; + } + + @JsonProperty("requestCount") + public void setRequestCount(Long requestCount) { + this.requestCount = requestCount; + } + + @JsonIgnore + public APIRequestCountStatusCHByNodeBuilder edit() { + return new APIRequestCountStatusCHByNodeBuilder(this); + } + + @JsonIgnore + public APIRequestCountStatusCHByNodeBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/APIRequestCountStatusConditions.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/APIRequestCountStatusConditions.java new file mode 100644 index 00000000000..46ebde5b24b --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/APIRequestCountStatusConditions.java @@ -0,0 +1,178 @@ + +package io.fabric8.openshift.api.model.miscellaneous.apiserver.v1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "lastTransitionTime", + "message", + "observedGeneration", + "reason", + "status", + "type" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class APIRequestCountStatusConditions implements Editable , KubernetesResource +{ + + @JsonProperty("lastTransitionTime") + private String lastTransitionTime; + @JsonProperty("message") + private String message; + @JsonProperty("observedGeneration") + private Long observedGeneration; + @JsonProperty("reason") + private String reason; + @JsonProperty("status") + private String status; + @JsonProperty("type") + private String type; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public APIRequestCountStatusConditions() { + } + + public APIRequestCountStatusConditions(String lastTransitionTime, String message, Long observedGeneration, String reason, String status, 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 String getMessage() { + return message; + } + + @JsonProperty("message") + public void setMessage(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 String getReason() { + return reason; + } + + @JsonProperty("reason") + public void setReason(String reason) { + this.reason = reason; + } + + @JsonProperty("status") + public String getStatus() { + return status; + } + + @JsonProperty("status") + public void setStatus(String status) { + this.status = status; + } + + @JsonProperty("type") + public String getType() { + return type; + } + + @JsonProperty("type") + public void setType(String type) { + this.type = type; + } + + @JsonIgnore + public APIRequestCountStatusConditionsBuilder edit() { + return new APIRequestCountStatusConditionsBuilder(this); + } + + @JsonIgnore + public APIRequestCountStatusConditionsBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/APIRequestCountStatusCurrentHour.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/APIRequestCountStatusCurrentHour.java new file mode 100644 index 00000000000..c7d92770f5c --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/APIRequestCountStatusCurrentHour.java @@ -0,0 +1,126 @@ + +package io.fabric8.openshift.api.model.miscellaneous.apiserver.v1; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "byNode", + "requestCount" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class APIRequestCountStatusCurrentHour implements Editable , KubernetesResource +{ + + @JsonProperty("byNode") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List byNode = new ArrayList<>(); + @JsonProperty("requestCount") + private Long requestCount; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public APIRequestCountStatusCurrentHour() { + } + + public APIRequestCountStatusCurrentHour(List byNode, Long requestCount) { + super(); + this.byNode = byNode; + this.requestCount = requestCount; + } + + @JsonProperty("byNode") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getByNode() { + return byNode; + } + + @JsonProperty("byNode") + public void setByNode(List byNode) { + this.byNode = byNode; + } + + @JsonProperty("requestCount") + public Long getRequestCount() { + return requestCount; + } + + @JsonProperty("requestCount") + public void setRequestCount(Long requestCount) { + this.requestCount = requestCount; + } + + @JsonIgnore + public APIRequestCountStatusCurrentHourBuilder edit() { + return new APIRequestCountStatusCurrentHourBuilder(this); + } + + @JsonIgnore + public APIRequestCountStatusCurrentHourBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/PerVerbAPIRequestCount.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/APIRequestCountStatusLBNBUByVerb.java similarity index 88% rename from kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/PerVerbAPIRequestCount.java rename to kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/APIRequestCountStatusLBNBUByVerb.java index 6f29233a762..7742ab1c7eb 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/PerVerbAPIRequestCount.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/APIRequestCountStatusLBNBUByVerb.java @@ -52,7 +52,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class PerVerbAPIRequestCount implements Editable , KubernetesResource +public class APIRequestCountStatusLBNBUByVerb implements Editable , KubernetesResource { @JsonProperty("requestCount") @@ -66,10 +66,10 @@ public class PerVerbAPIRequestCount implements Editable , KubernetesResource +public class APIRequestCountStatusLBNByUser implements Editable , KubernetesResource { @JsonProperty("byVerb") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List byVerb = new ArrayList<>(); + private List byVerb = new ArrayList<>(); @JsonProperty("requestCount") private Long requestCount; @JsonProperty("userAgent") @@ -75,10 +75,10 @@ public class PerUserAPIRequestCount implements Editable byVerb, Long requestCount, String userAgent, String username) { + public APIRequestCountStatusLBNByUser(List byVerb, Long requestCount, String userAgent, String username) { super(); this.byVerb = byVerb; this.requestCount = requestCount; @@ -88,12 +88,12 @@ public PerUserAPIRequestCount(List byVerb, Long requestC @JsonProperty("byVerb") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getByVerb() { + public List getByVerb() { return byVerb; } @JsonProperty("byVerb") - public void setByVerb(List byVerb) { + public void setByVerb(List byVerb) { this.byVerb = byVerb; } @@ -128,12 +128,12 @@ public void setUsername(String username) { } @JsonIgnore - public PerUserAPIRequestCountBuilder edit() { - return new PerUserAPIRequestCountBuilder(this); + public APIRequestCountStatusLBNByUserBuilder edit() { + return new APIRequestCountStatusLBNByUserBuilder(this); } @JsonIgnore - public PerUserAPIRequestCountBuilder toBuilder() { + public APIRequestCountStatusLBNByUserBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/PerNodeAPIRequestLog.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/APIRequestCountStatusLByNode.java similarity index 85% rename from kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/PerNodeAPIRequestLog.java rename to kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/APIRequestCountStatusLByNode.java index 843d307ac7e..8dc01ce4126 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/PerNodeAPIRequestLog.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/APIRequestCountStatusLByNode.java @@ -55,12 +55,12 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class PerNodeAPIRequestLog implements Editable , KubernetesResource +public class APIRequestCountStatusLByNode implements Editable , KubernetesResource { @JsonProperty("byUser") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List byUser = new ArrayList<>(); + private List byUser = new ArrayList<>(); @JsonProperty("nodeName") private String nodeName; @JsonProperty("requestCount") @@ -72,10 +72,10 @@ public class PerNodeAPIRequestLog implements Editable byUser, String nodeName, Long requestCount) { + public APIRequestCountStatusLByNode(List byUser, String nodeName, Long requestCount) { super(); this.byUser = byUser; this.nodeName = nodeName; @@ -84,12 +84,12 @@ public PerNodeAPIRequestLog(List byUser, String nodeName @JsonProperty("byUser") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getByUser() { + public List getByUser() { return byUser; } @JsonProperty("byUser") - public void setByUser(List byUser) { + public void setByUser(List byUser) { this.byUser = byUser; } @@ -114,12 +114,12 @@ public void setRequestCount(Long requestCount) { } @JsonIgnore - public PerNodeAPIRequestLogBuilder edit() { - return new PerNodeAPIRequestLogBuilder(this); + public APIRequestCountStatusLByNodeBuilder edit() { + return new APIRequestCountStatusLByNodeBuilder(this); } @JsonIgnore - public PerNodeAPIRequestLogBuilder toBuilder() { + public APIRequestCountStatusLByNodeBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/PerResourceAPIRequestLog.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/APIRequestCountStatusLast24h.java similarity index 84% rename from kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/PerResourceAPIRequestLog.java rename to kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/APIRequestCountStatusLast24h.java index b84eb900dad..a002b9c6bb6 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/PerResourceAPIRequestLog.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/APIRequestCountStatusLast24h.java @@ -54,12 +54,12 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class PerResourceAPIRequestLog implements Editable , KubernetesResource +public class APIRequestCountStatusLast24h implements Editable , KubernetesResource { @JsonProperty("byNode") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List byNode = new ArrayList<>(); + private List byNode = new ArrayList<>(); @JsonProperty("requestCount") private Long requestCount; @JsonIgnore @@ -69,10 +69,10 @@ public class PerResourceAPIRequestLog implements Editable byNode, Long requestCount) { + public APIRequestCountStatusLast24h(List byNode, Long requestCount) { super(); this.byNode = byNode; this.requestCount = requestCount; @@ -80,12 +80,12 @@ public PerResourceAPIRequestLog(List byNode, Long requestC @JsonProperty("byNode") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getByNode() { + public List getByNode() { return byNode; } @JsonProperty("byNode") - public void setByNode(List byNode) { + public void setByNode(List byNode) { this.byNode = byNode; } @@ -100,12 +100,12 @@ public void setRequestCount(Long requestCount) { } @JsonIgnore - public PerResourceAPIRequestLogBuilder edit() { - return new PerResourceAPIRequestLogBuilder(this); + public APIRequestCountStatusLast24hBuilder edit() { + return new APIRequestCountStatusLast24hBuilder(this); } @JsonIgnore - public PerResourceAPIRequestLogBuilder toBuilder() { + public APIRequestCountStatusLast24hBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/cloudcredential/v1/CredentialsRequest.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/cloudcredential/v1/CredentialsRequest.java index bf71c4c18c5..36f56559715 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/cloudcredential/v1/CredentialsRequest.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/cloudcredential/v1/CredentialsRequest.java @@ -18,6 +18,7 @@ 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.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -48,7 +49,7 @@ "" }) @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(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @@ -82,7 +83,7 @@ public class CredentialsRequest implements Editable , @JsonProperty("kind") private String kind = "CredentialsRequest"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("spec") private CredentialsRequestSpec spec; @JsonProperty("status") @@ -97,7 +98,7 @@ public class CredentialsRequest implements Editable , public CredentialsRequest() { } - public CredentialsRequest(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, CredentialsRequestSpec spec, CredentialsRequestStatus status) { + public CredentialsRequest(String apiVersion, String kind, ObjectMeta metadata, CredentialsRequestSpec spec, CredentialsRequestStatus status) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -147,12 +148,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/cloudcredential/v1/CredentialsRequestSpec.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/cloudcredential/v1/CredentialsRequestSpec.java index 1b86704465e..268a4fefd15 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/cloudcredential/v1/CredentialsRequestSpec.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/cloudcredential/v1/CredentialsRequestSpec.java @@ -20,6 +20,7 @@ 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; @@ -50,7 +51,7 @@ @BuildableReference(PodTemplateSpec.class), @BuildableReference(ResourceRequirements.class), @BuildableReference(IntOrString.class), - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class), + @BuildableReference(ObjectReference.class), @BuildableReference(LocalObjectReference.class), @BuildableReference(PersistentVolumeClaim.class) }) @@ -59,17 +60,17 @@ public class CredentialsRequestSpec implements Editable providerSpec = new LinkedHashMap<>(); + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + private Object providerSpec; @JsonProperty("secretRef") - private io.fabric8.kubernetes.api.model.ObjectReference secretRef; + private CredentialsRequestSpecSecretRef secretRef; @JsonProperty("serviceAccountNames") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List serviceAccountNames = new ArrayList<>(); + private List serviceAccountNames = new ArrayList<>(); @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -78,7 +79,7 @@ public class CredentialsRequestSpec implements Editable providerSpec, io.fabric8.kubernetes.api.model.ObjectReference secretRef, List serviceAccountNames) { + public CredentialsRequestSpec(String cloudTokenPath, Object providerSpec, CredentialsRequestSpecSecretRef secretRef, List serviceAccountNames) { super(); this.cloudTokenPath = cloudTokenPath; this.providerSpec = providerSpec; @@ -87,44 +88,44 @@ public CredentialsRequestSpec(java.lang.String cloudTokenPath, Map getProviderSpec() { + public Object getProviderSpec() { return providerSpec; } @JsonProperty("providerSpec") - public void setProviderSpec(Map providerSpec) { + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + public void setProviderSpec(Object providerSpec) { this.providerSpec = providerSpec; } @JsonProperty("secretRef") - public io.fabric8.kubernetes.api.model.ObjectReference getSecretRef() { + public CredentialsRequestSpecSecretRef getSecretRef() { return secretRef; } @JsonProperty("secretRef") - public void setSecretRef(io.fabric8.kubernetes.api.model.ObjectReference secretRef) { + public void setSecretRef(CredentialsRequestSpecSecretRef secretRef) { this.secretRef = secretRef; } @JsonProperty("serviceAccountNames") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getServiceAccountNames() { + public List getServiceAccountNames() { return serviceAccountNames; } @JsonProperty("serviceAccountNames") - public void setServiceAccountNames(List serviceAccountNames) { + public void setServiceAccountNames(List serviceAccountNames) { this.serviceAccountNames = serviceAccountNames; } @@ -139,16 +140,16 @@ public CredentialsRequestSpecBuilder toBuilder() { } @JsonAnyGetter - public Map getAdditionalProperties() { + public Map getAdditionalProperties() { return this.additionalProperties; } @JsonAnySetter - public void setAdditionalProperty(java.lang.String name, java.lang.Object value) { + public void setAdditionalProperty(String name, Object value) { this.additionalProperties.put(name, value); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/cloudcredential/v1/CredentialsRequestSpecSecretRef.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/cloudcredential/v1/CredentialsRequestSpecSecretRef.java new file mode 100644 index 00000000000..efc295ecba0 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/cloudcredential/v1/CredentialsRequestSpecSecretRef.java @@ -0,0 +1,192 @@ + +package io.fabric8.openshift.api.model.miscellaneous.cloudcredential.v1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "fieldPath", + "name", + "namespace", + "resourceVersion", + "uid" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class CredentialsRequestSpecSecretRef implements Editable , KubernetesResource +{ + + @JsonProperty("apiVersion") + private String apiVersion; + @JsonProperty("fieldPath") + private String fieldPath; + @JsonProperty("kind") + private String kind; + @JsonProperty("name") + private String name; + @JsonProperty("namespace") + private String namespace; + @JsonProperty("resourceVersion") + private String resourceVersion; + @JsonProperty("uid") + private String uid; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public CredentialsRequestSpecSecretRef() { + } + + public CredentialsRequestSpecSecretRef(String apiVersion, String fieldPath, String kind, String name, String namespace, String resourceVersion, String uid) { + super(); + this.apiVersion = apiVersion; + this.fieldPath = fieldPath; + this.kind = kind; + this.name = name; + this.namespace = namespace; + this.resourceVersion = resourceVersion; + this.uid = uid; + } + + @JsonProperty("apiVersion") + public String getApiVersion() { + return apiVersion; + } + + @JsonProperty("apiVersion") + public void setApiVersion(String apiVersion) { + this.apiVersion = apiVersion; + } + + @JsonProperty("fieldPath") + public String getFieldPath() { + return fieldPath; + } + + @JsonProperty("fieldPath") + public void setFieldPath(String fieldPath) { + this.fieldPath = fieldPath; + } + + @JsonProperty("kind") + public String getKind() { + return kind; + } + + @JsonProperty("kind") + public void setKind(String kind) { + this.kind = kind; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonProperty("namespace") + public String getNamespace() { + return namespace; + } + + @JsonProperty("namespace") + public void setNamespace(String namespace) { + this.namespace = namespace; + } + + @JsonProperty("resourceVersion") + public String getResourceVersion() { + return resourceVersion; + } + + @JsonProperty("resourceVersion") + public void setResourceVersion(String resourceVersion) { + this.resourceVersion = resourceVersion; + } + + @JsonProperty("uid") + public String getUid() { + return uid; + } + + @JsonProperty("uid") + public void setUid(String uid) { + this.uid = uid; + } + + @JsonIgnore + public CredentialsRequestSpecSecretRefBuilder edit() { + return new CredentialsRequestSpecSecretRefBuilder(this); + } + + @JsonIgnore + public CredentialsRequestSpecSecretRefBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/cloudcredential/v1/CredentialsRequestStatus.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/cloudcredential/v1/CredentialsRequestStatus.java index f4712e72086..fba4963d651 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/cloudcredential/v1/CredentialsRequestStatus.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/cloudcredential/v1/CredentialsRequestStatus.java @@ -63,20 +63,20 @@ public class CredentialsRequestStatus implements Editable conditions = new ArrayList<>(); + private List conditions = new ArrayList<>(); @JsonProperty("lastSyncCloudCredsSecretResourceVersion") - private java.lang.String lastSyncCloudCredsSecretResourceVersion; + private String lastSyncCloudCredsSecretResourceVersion; @JsonProperty("lastSyncGeneration") private Long lastSyncGeneration; @JsonProperty("lastSyncTimestamp") - private java.lang.String lastSyncTimestamp; + private String lastSyncTimestamp; @JsonProperty("providerStatus") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Map providerStatus = new LinkedHashMap<>(); + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + private Object providerStatus; @JsonProperty("provisioned") private Boolean provisioned; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -85,7 +85,7 @@ public class CredentialsRequestStatus implements Editable conditions, java.lang.String lastSyncCloudCredsSecretResourceVersion, Long lastSyncGeneration, java.lang.String lastSyncTimestamp, Map providerStatus, Boolean provisioned) { + public CredentialsRequestStatus(List conditions, String lastSyncCloudCredsSecretResourceVersion, Long lastSyncGeneration, String lastSyncTimestamp, Object providerStatus, Boolean provisioned) { super(); this.conditions = conditions; this.lastSyncCloudCredsSecretResourceVersion = lastSyncCloudCredsSecretResourceVersion; @@ -97,22 +97,22 @@ public CredentialsRequestStatus(List conditions, ja @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getConditions() { + public List getConditions() { return conditions; } @JsonProperty("conditions") - public void setConditions(List conditions) { + public void setConditions(List conditions) { this.conditions = conditions; } @JsonProperty("lastSyncCloudCredsSecretResourceVersion") - public java.lang.String getLastSyncCloudCredsSecretResourceVersion() { + public String getLastSyncCloudCredsSecretResourceVersion() { return lastSyncCloudCredsSecretResourceVersion; } @JsonProperty("lastSyncCloudCredsSecretResourceVersion") - public void setLastSyncCloudCredsSecretResourceVersion(java.lang.String lastSyncCloudCredsSecretResourceVersion) { + public void setLastSyncCloudCredsSecretResourceVersion(String lastSyncCloudCredsSecretResourceVersion) { this.lastSyncCloudCredsSecretResourceVersion = lastSyncCloudCredsSecretResourceVersion; } @@ -127,23 +127,23 @@ public void setLastSyncGeneration(Long lastSyncGeneration) { } @JsonProperty("lastSyncTimestamp") - public java.lang.String getLastSyncTimestamp() { + public String getLastSyncTimestamp() { return lastSyncTimestamp; } @JsonProperty("lastSyncTimestamp") - public void setLastSyncTimestamp(java.lang.String lastSyncTimestamp) { + public void setLastSyncTimestamp(String lastSyncTimestamp) { this.lastSyncTimestamp = lastSyncTimestamp; } @JsonProperty("providerStatus") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public Map getProviderStatus() { + public Object getProviderStatus() { return providerStatus; } @JsonProperty("providerStatus") - public void setProviderStatus(Map providerStatus) { + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + public void setProviderStatus(Object providerStatus) { this.providerStatus = providerStatus; } @@ -168,16 +168,16 @@ public CredentialsRequestStatusBuilder toBuilder() { } @JsonAnyGetter - public Map getAdditionalProperties() { + public Map getAdditionalProperties() { return this.additionalProperties; } @JsonAnySetter - public void setAdditionalProperty(java.lang.String name, java.lang.Object value) { + public void setAdditionalProperty(String name, Object value) { this.additionalProperties.put(name, value); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/cloudcredential/v1/CredentialsRequestCondition.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/cloudcredential/v1/CredentialsRequestStatusConditions.java similarity index 90% rename from kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/cloudcredential/v1/CredentialsRequestCondition.java rename to kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/cloudcredential/v1/CredentialsRequestStatusConditions.java index 3c68d92d706..070440780a0 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/cloudcredential/v1/CredentialsRequestCondition.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/cloudcredential/v1/CredentialsRequestStatusConditions.java @@ -56,7 +56,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class CredentialsRequestCondition implements Editable , KubernetesResource +public class CredentialsRequestStatusConditions implements Editable , KubernetesResource { @JsonProperty("lastProbeTime") @@ -78,10 +78,10 @@ public class CredentialsRequestCondition implements Editable @JsonProperty("kind") private String kind = "HelmChartRepository"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("spec") private HelmChartRepositorySpec spec; @JsonProperty("status") @@ -96,7 +97,7 @@ public class HelmChartRepository implements Editable public HelmChartRepository() { } - public HelmChartRepository(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, HelmChartRepositorySpec spec, HelmChartRepositoryStatus status) { + public HelmChartRepository(String apiVersion, String kind, ObjectMeta metadata, HelmChartRepositorySpec spec, HelmChartRepositoryStatus status) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -146,12 +147,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/HelmChartRepositoryList.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1/HelmChartRepositoryList.java similarity index 89% rename from kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/HelmChartRepositoryList.java rename to kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1/HelmChartRepositoryList.java index 1e342cf553d..0ccaf2ff387 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/HelmChartRepositoryList.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1/HelmChartRepositoryList.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model; +package io.fabric8.openshift.api.model.miscellaneous.helm.v1beta1; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -67,7 +67,7 @@ @Version("v1beta1") @Group("helm.openshift.io") @Generated("jsonschema2pojo") -public class HelmChartRepositoryList implements Editable , KubernetesResource, KubernetesResourceList +public class HelmChartRepositoryList implements Editable , KubernetesResource, KubernetesResourceList { /** @@ -79,7 +79,7 @@ public class HelmChartRepositoryList implements Editable items = new ArrayList<>(); + private List items = new ArrayList<>(); /** * * (Required) @@ -99,7 +99,7 @@ public class HelmChartRepositoryList implements Editable items, String kind, ListMeta metadata) { + public HelmChartRepositoryList(String apiVersion, List items, String kind, ListMeta metadata) { super(); this.apiVersion = apiVersion; this.items = items; @@ -129,12 +129,12 @@ public void setApiVersion(String apiVersion) { @JsonProperty("items") @JsonInclude(JsonInclude.Include.NON_EMPTY) - 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/openshift-model/src/generated/java/io/fabric8/openshift/api/model/HelmChartRepositorySpec.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1/HelmChartRepositorySpec.java similarity index 90% rename from kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/HelmChartRepositorySpec.java rename to kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1/HelmChartRepositorySpec.java index d3c0806d458..2c1c0957f84 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/HelmChartRepositorySpec.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1/HelmChartRepositorySpec.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model; +package io.fabric8.openshift.api.model.miscellaneous.helm.v1beta1; import java.util.LinkedHashMap; import java.util.Map; @@ -58,7 +58,7 @@ public class HelmChartRepositorySpec implements Editable , KubernetesResource +public class HelmChartRepositorySpecCCCa implements Editable , KubernetesResource { @JsonProperty("name") @@ -63,10 +63,10 @@ public class S3TrustedCASource implements Editable , K * No args constructor for use in serialization * */ - public S3TrustedCASource() { + public HelmChartRepositorySpecCCCa() { } - public S3TrustedCASource(String name) { + public HelmChartRepositorySpecCCCa(String name) { super(); this.name = name; } @@ -82,12 +82,12 @@ public void setName(String name) { } @JsonIgnore - public S3TrustedCASourceBuilder edit() { - return new S3TrustedCASourceBuilder(this); + public HelmChartRepositorySpecCCCaBuilder edit() { + return new HelmChartRepositorySpecCCCaBuilder(this); } @JsonIgnore - public S3TrustedCASourceBuilder toBuilder() { + public HelmChartRepositorySpecCCCaBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1/HelmChartRepositorySpecCCTlsClientConfig.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1/HelmChartRepositorySpecCCTlsClientConfig.java new file mode 100644 index 00000000000..79fa99bfe42 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1/HelmChartRepositorySpecCCTlsClientConfig.java @@ -0,0 +1,108 @@ + +package io.fabric8.openshift.api.model.miscellaneous.helm.v1beta1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "name" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class HelmChartRepositorySpecCCTlsClientConfig implements Editable , KubernetesResource +{ + + @JsonProperty("name") + private String name; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public HelmChartRepositorySpecCCTlsClientConfig() { + } + + public HelmChartRepositorySpecCCTlsClientConfig(String name) { + super(); + this.name = name; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonIgnore + public HelmChartRepositorySpecCCTlsClientConfigBuilder edit() { + return new HelmChartRepositorySpecCCTlsClientConfigBuilder(this); + } + + @JsonIgnore + public HelmChartRepositorySpecCCTlsClientConfigBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ConnectionConfig.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1/HelmChartRepositorySpecConnectionConfig.java similarity index 77% rename from kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ConnectionConfig.java rename to kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1/HelmChartRepositorySpecConnectionConfig.java index 0834123f860..f9c108e2ed1 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ConnectionConfig.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1/HelmChartRepositorySpecConnectionConfig.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model; +package io.fabric8.openshift.api.model.miscellaneous.helm.v1beta1; import java.util.LinkedHashMap; import java.util.Map; @@ -22,8 +22,6 @@ import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.fabric8.openshift.api.model.config.v1.BuildSpecBDDPTrustedCA; -import io.fabric8.openshift.api.model.config.v1.OAuthSpecIPBasicAuthCa; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; import lombok.EqualsAndHashCode; @@ -55,13 +53,13 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ConnectionConfig implements Editable , KubernetesResource +public class HelmChartRepositorySpecConnectionConfig implements Editable , KubernetesResource { @JsonProperty("ca") - private BuildSpecBDDPTrustedCA ca; + private HelmChartRepositorySpecCCCa ca; @JsonProperty("tlsClientConfig") - private OAuthSpecIPBasicAuthCa tlsClientConfig; + private HelmChartRepositorySpecCCTlsClientConfig tlsClientConfig; @JsonProperty("url") private String url; @JsonIgnore @@ -71,10 +69,10 @@ public class ConnectionConfig implements Editable , Kub * No args constructor for use in serialization * */ - public ConnectionConfig() { + public HelmChartRepositorySpecConnectionConfig() { } - public ConnectionConfig(BuildSpecBDDPTrustedCA ca, OAuthSpecIPBasicAuthCa tlsClientConfig, String url) { + public HelmChartRepositorySpecConnectionConfig(HelmChartRepositorySpecCCCa ca, HelmChartRepositorySpecCCTlsClientConfig tlsClientConfig, String url) { super(); this.ca = ca; this.tlsClientConfig = tlsClientConfig; @@ -82,22 +80,22 @@ public ConnectionConfig(BuildSpecBDDPTrustedCA ca, OAuthSpecIPBasicAuthCa tlsCli } @JsonProperty("ca") - public BuildSpecBDDPTrustedCA getCa() { + public HelmChartRepositorySpecCCCa getCa() { return ca; } @JsonProperty("ca") - public void setCa(BuildSpecBDDPTrustedCA ca) { + public void setCa(HelmChartRepositorySpecCCCa ca) { this.ca = ca; } @JsonProperty("tlsClientConfig") - public OAuthSpecIPBasicAuthCa getTlsClientConfig() { + public HelmChartRepositorySpecCCTlsClientConfig getTlsClientConfig() { return tlsClientConfig; } @JsonProperty("tlsClientConfig") - public void setTlsClientConfig(OAuthSpecIPBasicAuthCa tlsClientConfig) { + public void setTlsClientConfig(HelmChartRepositorySpecCCTlsClientConfig tlsClientConfig) { this.tlsClientConfig = tlsClientConfig; } @@ -112,12 +110,12 @@ public void setUrl(String url) { } @JsonIgnore - public ConnectionConfigBuilder edit() { - return new ConnectionConfigBuilder(this); + public HelmChartRepositorySpecConnectionConfigBuilder edit() { + return new HelmChartRepositorySpecConnectionConfigBuilder(this); } @JsonIgnore - public ConnectionConfigBuilder toBuilder() { + public HelmChartRepositorySpecConnectionConfigBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/HelmChartRepositoryStatus.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1/HelmChartRepositoryStatus.java similarity index 89% rename from kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/HelmChartRepositoryStatus.java rename to kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1/HelmChartRepositoryStatus.java index 06f6db5ff08..04729c829ea 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/HelmChartRepositoryStatus.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1/HelmChartRepositoryStatus.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model; +package io.fabric8.openshift.api.model.miscellaneous.helm.v1beta1; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -14,7 +14,6 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.fabric8.kubernetes.api.builder.Editable; -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; @@ -59,7 +58,7 @@ public class HelmChartRepositoryStatus implements Editable conditions = new ArrayList<>(); + private List conditions = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -70,19 +69,19 @@ public class HelmChartRepositoryStatus implements Editable conditions) { + public HelmChartRepositoryStatus(List conditions) { super(); this.conditions = conditions; } @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getConditions() { + public List getConditions() { return conditions; } @JsonProperty("conditions") - public void setConditions(List conditions) { + public void setConditions(List conditions) { this.conditions = conditions; } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1/HelmChartRepositoryStatusConditions.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1/HelmChartRepositoryStatusConditions.java new file mode 100644 index 00000000000..eb78ca0da54 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1/HelmChartRepositoryStatusConditions.java @@ -0,0 +1,178 @@ + +package io.fabric8.openshift.api.model.miscellaneous.helm.v1beta1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "lastTransitionTime", + "message", + "observedGeneration", + "reason", + "status", + "type" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class HelmChartRepositoryStatusConditions implements Editable , KubernetesResource +{ + + @JsonProperty("lastTransitionTime") + private String lastTransitionTime; + @JsonProperty("message") + private String message; + @JsonProperty("observedGeneration") + private Long observedGeneration; + @JsonProperty("reason") + private String reason; + @JsonProperty("status") + private String status; + @JsonProperty("type") + private String type; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public HelmChartRepositoryStatusConditions() { + } + + public HelmChartRepositoryStatusConditions(String lastTransitionTime, String message, Long observedGeneration, String reason, String status, 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 String getMessage() { + return message; + } + + @JsonProperty("message") + public void setMessage(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 String getReason() { + return reason; + } + + @JsonProperty("reason") + public void setReason(String reason) { + this.reason = reason; + } + + @JsonProperty("status") + public String getStatus() { + return status; + } + + @JsonProperty("status") + public void setStatus(String status) { + this.status = status; + } + + @JsonProperty("type") + public String getType() { + return type; + } + + @JsonProperty("type") + public void setType(String type) { + this.type = type; + } + + @JsonIgnore + public HelmChartRepositoryStatusConditionsBuilder edit() { + return new HelmChartRepositoryStatusConditionsBuilder(this); + } + + @JsonIgnore + public HelmChartRepositoryStatusConditionsBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ProjectHelmChartRepository.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1/ProjectHelmChartRepository.java similarity index 89% rename from kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ProjectHelmChartRepository.java rename to kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1/ProjectHelmChartRepository.java index 5da0fa41a7f..d2da533bd4d 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ProjectHelmChartRepository.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1/ProjectHelmChartRepository.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model; +package io.fabric8.openshift.api.model.miscellaneous.helm.v1beta1; import java.util.LinkedHashMap; import java.util.Map; @@ -18,6 +18,7 @@ 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.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -48,7 +49,7 @@ "" }) @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(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @@ -82,11 +83,11 @@ public class ProjectHelmChartRepository implements Editable additionalProperties = new LinkedHashMap(); @@ -97,7 +98,7 @@ public class ProjectHelmChartRepository implements Editable , KubernetesResource, KubernetesResourceList +public class ProjectHelmChartRepositoryList implements Editable , KubernetesResource, KubernetesResourceList { /** @@ -79,7 +79,7 @@ public class ProjectHelmChartRepositoryList implements Editable items = new ArrayList<>(); + private List items = new ArrayList<>(); /** * * (Required) @@ -99,7 +99,7 @@ public class ProjectHelmChartRepositoryList implements Editable items, String kind, ListMeta metadata) { + public ProjectHelmChartRepositoryList(String apiVersion, List items, String kind, ListMeta metadata) { super(); this.apiVersion = apiVersion; this.items = items; @@ -129,12 +129,12 @@ public void setApiVersion(String apiVersion) { @JsonProperty("items") @JsonInclude(JsonInclude.Include.NON_EMPTY) - 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/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ProjectHelmChartRepositorySpec.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1/ProjectHelmChartRepositorySpec.java similarity index 90% rename from kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ProjectHelmChartRepositorySpec.java rename to kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1/ProjectHelmChartRepositorySpec.java index 6fc4fd7ddab..cb30ddb2c2e 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ProjectHelmChartRepositorySpec.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1/ProjectHelmChartRepositorySpec.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model; +package io.fabric8.openshift.api.model.miscellaneous.helm.v1beta1; import java.util.LinkedHashMap; import java.util.Map; @@ -58,7 +58,7 @@ public class ProjectHelmChartRepositorySpec implements Editable , KubernetesResource +public class ProjectHelmChartRepositorySpecCCBasicAuthConfig implements Editable , KubernetesResource { - @JsonProperty("targetCert") - private CertSpec targetCert; + @JsonProperty("name") + private String name; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -63,31 +63,31 @@ public class OperatorPKISpec implements Editable , Kuber * No args constructor for use in serialization * */ - public OperatorPKISpec() { + public ProjectHelmChartRepositorySpecCCBasicAuthConfig() { } - public OperatorPKISpec(CertSpec targetCert) { + public ProjectHelmChartRepositorySpecCCBasicAuthConfig(String name) { super(); - this.targetCert = targetCert; + this.name = name; } - @JsonProperty("targetCert") - public CertSpec getTargetCert() { - return targetCert; + @JsonProperty("name") + public String getName() { + return name; } - @JsonProperty("targetCert") - public void setTargetCert(CertSpec targetCert) { - this.targetCert = targetCert; + @JsonProperty("name") + public void setName(String name) { + this.name = name; } @JsonIgnore - public OperatorPKISpecBuilder edit() { - return new OperatorPKISpecBuilder(this); + public ProjectHelmChartRepositorySpecCCBasicAuthConfigBuilder edit() { + return new ProjectHelmChartRepositorySpecCCBasicAuthConfigBuilder(this); } @JsonIgnore - public OperatorPKISpecBuilder toBuilder() { + public ProjectHelmChartRepositorySpecCCBasicAuthConfigBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1/ProjectHelmChartRepositorySpecCCCa.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1/ProjectHelmChartRepositorySpecCCCa.java new file mode 100644 index 00000000000..faba6a4af50 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1/ProjectHelmChartRepositorySpecCCCa.java @@ -0,0 +1,108 @@ + +package io.fabric8.openshift.api.model.miscellaneous.helm.v1beta1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "name" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class ProjectHelmChartRepositorySpecCCCa implements Editable , KubernetesResource +{ + + @JsonProperty("name") + private String name; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ProjectHelmChartRepositorySpecCCCa() { + } + + public ProjectHelmChartRepositorySpecCCCa(String name) { + super(); + this.name = name; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonIgnore + public ProjectHelmChartRepositorySpecCCCaBuilder edit() { + return new ProjectHelmChartRepositorySpecCCCaBuilder(this); + } + + @JsonIgnore + public ProjectHelmChartRepositorySpecCCCaBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1/ProjectHelmChartRepositorySpecCCTlsClientConfig.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1/ProjectHelmChartRepositorySpecCCTlsClientConfig.java new file mode 100644 index 00000000000..220dcc869c2 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1/ProjectHelmChartRepositorySpecCCTlsClientConfig.java @@ -0,0 +1,108 @@ + +package io.fabric8.openshift.api.model.miscellaneous.helm.v1beta1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "name" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class ProjectHelmChartRepositorySpecCCTlsClientConfig implements Editable , KubernetesResource +{ + + @JsonProperty("name") + private String name; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ProjectHelmChartRepositorySpecCCTlsClientConfig() { + } + + public ProjectHelmChartRepositorySpecCCTlsClientConfig(String name) { + super(); + this.name = name; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonIgnore + public ProjectHelmChartRepositorySpecCCTlsClientConfigBuilder edit() { + return new ProjectHelmChartRepositorySpecCCTlsClientConfigBuilder(this); + } + + @JsonIgnore + public ProjectHelmChartRepositorySpecCCTlsClientConfigBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ConnectionConfigNamespaceScoped.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1/ProjectHelmChartRepositorySpecConnectionConfig.java similarity index 72% rename from kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ConnectionConfigNamespaceScoped.java rename to kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1/ProjectHelmChartRepositorySpecConnectionConfig.java index 275b44966f6..c174758421a 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ConnectionConfigNamespaceScoped.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1/ProjectHelmChartRepositorySpecConnectionConfig.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model; +package io.fabric8.openshift.api.model.miscellaneous.helm.v1beta1; import java.util.LinkedHashMap; import java.util.Map; @@ -22,8 +22,6 @@ import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.fabric8.openshift.api.model.config.v1.BuildSpecBDDPTrustedCA; -import io.fabric8.openshift.api.model.config.v1.OAuthSpecIPBasicAuthCa; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; import lombok.EqualsAndHashCode; @@ -56,15 +54,15 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ConnectionConfigNamespaceScoped implements Editable , KubernetesResource +public class ProjectHelmChartRepositorySpecConnectionConfig implements Editable , KubernetesResource { @JsonProperty("basicAuthConfig") - private OAuthSpecIPBasicAuthCa basicAuthConfig; + private ProjectHelmChartRepositorySpecCCBasicAuthConfig basicAuthConfig; @JsonProperty("ca") - private BuildSpecBDDPTrustedCA ca; + private ProjectHelmChartRepositorySpecCCCa ca; @JsonProperty("tlsClientConfig") - private OAuthSpecIPBasicAuthCa tlsClientConfig; + private ProjectHelmChartRepositorySpecCCTlsClientConfig tlsClientConfig; @JsonProperty("url") private String url; @JsonIgnore @@ -74,10 +72,10 @@ public class ConnectionConfigNamespaceScoped implements Editable , KubernetesResource +public class ProjectHelmChartRepositoryStatus implements Editable , KubernetesResource { @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List conditions = new ArrayList<>(); + private List conditions = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -66,32 +66,32 @@ public class EgressRouterStatus implements Editable , * No args constructor for use in serialization * */ - public EgressRouterStatus() { + public ProjectHelmChartRepositoryStatus() { } - public EgressRouterStatus(List conditions) { + public ProjectHelmChartRepositoryStatus(List conditions) { super(); this.conditions = conditions; } @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getConditions() { + public List getConditions() { return conditions; } @JsonProperty("conditions") - public void setConditions(List conditions) { + public void setConditions(List conditions) { this.conditions = conditions; } @JsonIgnore - public EgressRouterStatusBuilder edit() { - return new EgressRouterStatusBuilder(this); + public ProjectHelmChartRepositoryStatusBuilder edit() { + return new ProjectHelmChartRepositoryStatusBuilder(this); } @JsonIgnore - public EgressRouterStatusBuilder toBuilder() { + public ProjectHelmChartRepositoryStatusBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1/ProjectHelmChartRepositoryStatusConditions.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1/ProjectHelmChartRepositoryStatusConditions.java new file mode 100644 index 00000000000..87a356fb67b --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1/ProjectHelmChartRepositoryStatusConditions.java @@ -0,0 +1,178 @@ + +package io.fabric8.openshift.api.model.miscellaneous.helm.v1beta1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "lastTransitionTime", + "message", + "observedGeneration", + "reason", + "status", + "type" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class ProjectHelmChartRepositoryStatusConditions implements Editable , KubernetesResource +{ + + @JsonProperty("lastTransitionTime") + private String lastTransitionTime; + @JsonProperty("message") + private String message; + @JsonProperty("observedGeneration") + private Long observedGeneration; + @JsonProperty("reason") + private String reason; + @JsonProperty("status") + private String status; + @JsonProperty("type") + private String type; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ProjectHelmChartRepositoryStatusConditions() { + } + + public ProjectHelmChartRepositoryStatusConditions(String lastTransitionTime, String message, Long observedGeneration, String reason, String status, 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 String getMessage() { + return message; + } + + @JsonProperty("message") + public void setMessage(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 String getReason() { + return reason; + } + + @JsonProperty("reason") + public void setReason(String reason) { + this.reason = reason; + } + + @JsonProperty("status") + public String getStatus() { + return status; + } + + @JsonProperty("status") + public void setStatus(String status) { + this.status = status; + } + + @JsonProperty("type") + public String getType() { + return type; + } + + @JsonProperty("type") + public void setType(String type) { + this.type = type; + } + + @JsonIgnore + public ProjectHelmChartRepositoryStatusConditionsBuilder edit() { + return new ProjectHelmChartRepositoryStatusConditionsBuilder(this); + } + + @JsonIgnore + public ProjectHelmChartRepositoryStatusConditionsBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryConfigProxy.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryConfigProxy.java deleted file mode 100644 index 848bb255f4d..00000000000 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryConfigProxy.java +++ /dev/null @@ -1,136 +0,0 @@ - -package io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -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.builder.Editable; -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.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "http", - "https", - "noProxy" -}) -@ToString -@EqualsAndHashCode -@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) -}) -@Generated("jsonschema2pojo") -public class ImageRegistryConfigProxy implements Editable , KubernetesResource -{ - - @JsonProperty("http") - private String http; - @JsonProperty("https") - private String https; - @JsonProperty("noProxy") - private String noProxy; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ImageRegistryConfigProxy() { - } - - public ImageRegistryConfigProxy(String http, String https, String noProxy) { - super(); - this.http = http; - this.https = https; - this.noProxy = noProxy; - } - - @JsonProperty("http") - public String getHttp() { - return http; - } - - @JsonProperty("http") - public void setHttp(String http) { - this.http = http; - } - - @JsonProperty("https") - public String getHttps() { - return https; - } - - @JsonProperty("https") - public void setHttps(String https) { - this.https = https; - } - - @JsonProperty("noProxy") - public String getNoProxy() { - return noProxy; - } - - @JsonProperty("noProxy") - public void setNoProxy(String noProxy) { - this.noProxy = noProxy; - } - - @JsonIgnore - public ImageRegistryConfigProxyBuilder edit() { - return new ImageRegistryConfigProxyBuilder(this); - } - - @JsonIgnore - public ImageRegistryConfigProxyBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryConfigRequests.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryConfigRequests.java deleted file mode 100644 index 0596710423a..00000000000 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryConfigRequests.java +++ /dev/null @@ -1,122 +0,0 @@ - -package io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -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.builder.Editable; -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.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "read", - "write" -}) -@ToString -@EqualsAndHashCode -@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) -}) -@Generated("jsonschema2pojo") -public class ImageRegistryConfigRequests implements Editable , KubernetesResource -{ - - @JsonProperty("read") - private ImageRegistryConfigRequestsLimits read; - @JsonProperty("write") - private ImageRegistryConfigRequestsLimits write; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ImageRegistryConfigRequests() { - } - - public ImageRegistryConfigRequests(ImageRegistryConfigRequestsLimits read, ImageRegistryConfigRequestsLimits write) { - super(); - this.read = read; - this.write = write; - } - - @JsonProperty("read") - public ImageRegistryConfigRequestsLimits getRead() { - return read; - } - - @JsonProperty("read") - public void setRead(ImageRegistryConfigRequestsLimits read) { - this.read = read; - } - - @JsonProperty("write") - public ImageRegistryConfigRequestsLimits getWrite() { - return write; - } - - @JsonProperty("write") - public void setWrite(ImageRegistryConfigRequestsLimits write) { - this.write = write; - } - - @JsonIgnore - public ImageRegistryConfigRequestsBuilder edit() { - return new ImageRegistryConfigRequestsBuilder(this); - } - - @JsonIgnore - public ImageRegistryConfigRequestsBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryConfigRequestsLimits.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryConfigRequestsLimits.java deleted file mode 100644 index e7054cf68b2..00000000000 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryConfigRequestsLimits.java +++ /dev/null @@ -1,137 +0,0 @@ - -package io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -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.builder.Editable; -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.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "maxInQueue", - "maxRunning", - "maxWaitInQueue" -}) -@ToString -@EqualsAndHashCode -@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) -}) -@Generated("jsonschema2pojo") -public class ImageRegistryConfigRequestsLimits implements Editable , KubernetesResource -{ - - @JsonProperty("maxInQueue") - private Integer maxInQueue; - @JsonProperty("maxRunning") - private Integer maxRunning; - @JsonProperty("maxWaitInQueue") - private Duration maxWaitInQueue; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ImageRegistryConfigRequestsLimits() { - } - - public ImageRegistryConfigRequestsLimits(Integer maxInQueue, Integer maxRunning, Duration maxWaitInQueue) { - super(); - this.maxInQueue = maxInQueue; - this.maxRunning = maxRunning; - this.maxWaitInQueue = maxWaitInQueue; - } - - @JsonProperty("maxInQueue") - public Integer getMaxInQueue() { - return maxInQueue; - } - - @JsonProperty("maxInQueue") - public void setMaxInQueue(Integer maxInQueue) { - this.maxInQueue = maxInQueue; - } - - @JsonProperty("maxRunning") - public Integer getMaxRunning() { - return maxRunning; - } - - @JsonProperty("maxRunning") - public void setMaxRunning(Integer maxRunning) { - this.maxRunning = maxRunning; - } - - @JsonProperty("maxWaitInQueue") - public Duration getMaxWaitInQueue() { - return maxWaitInQueue; - } - - @JsonProperty("maxWaitInQueue") - public void setMaxWaitInQueue(Duration maxWaitInQueue) { - this.maxWaitInQueue = maxWaitInQueue; - } - - @JsonIgnore - public ImageRegistryConfigRequestsLimitsBuilder edit() { - return new ImageRegistryConfigRequestsLimitsBuilder(this); - } - - @JsonIgnore - public ImageRegistryConfigRequestsLimitsBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} 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 deleted file mode 100644 index ed7e0c78c8c..00000000000 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryConfigStorage.java +++ /dev/null @@ -1,220 +0,0 @@ - -package io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -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.builder.Editable; -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.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "azure", - "emptyDir", - "gcs", - "ibmcos", - "managementState", - "oss", - "pvc", - "s3", - "swift" -}) -@ToString -@EqualsAndHashCode -@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) -}) -@Generated("jsonschema2pojo") -public class ImageRegistryConfigStorage implements Editable , KubernetesResource -{ - - @JsonProperty("azure") - private ImageRegistryConfigStorageAzure azure; - @JsonProperty("emptyDir") - private ImageRegistryConfigStorageEmptyDir emptyDir; - @JsonProperty("gcs") - private ImageRegistryConfigStorageGCS gcs; - @JsonProperty("ibmcos") - private ImageRegistryConfigStorageIBMCOS ibmcos; - @JsonProperty("managementState") - private String managementState; - @JsonProperty("oss") - private ImageRegistryConfigStorageAlibabaOSS oss; - @JsonProperty("pvc") - private ImageRegistryConfigStoragePVC pvc; - @JsonProperty("s3") - private ImageRegistryConfigStorageS3 s3; - @JsonProperty("swift") - private ImageRegistryConfigStorageSwift swift; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ImageRegistryConfigStorage() { - } - - 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; - } - - @JsonProperty("azure") - public ImageRegistryConfigStorageAzure getAzure() { - return azure; - } - - @JsonProperty("azure") - public void setAzure(ImageRegistryConfigStorageAzure azure) { - this.azure = azure; - } - - @JsonProperty("emptyDir") - public ImageRegistryConfigStorageEmptyDir getEmptyDir() { - return emptyDir; - } - - @JsonProperty("emptyDir") - public void setEmptyDir(ImageRegistryConfigStorageEmptyDir emptyDir) { - this.emptyDir = emptyDir; - } - - @JsonProperty("gcs") - public ImageRegistryConfigStorageGCS getGcs() { - return gcs; - } - - @JsonProperty("gcs") - public void setGcs(ImageRegistryConfigStorageGCS gcs) { - this.gcs = gcs; - } - - @JsonProperty("ibmcos") - public ImageRegistryConfigStorageIBMCOS getIbmcos() { - return ibmcos; - } - - @JsonProperty("ibmcos") - public void setIbmcos(ImageRegistryConfigStorageIBMCOS ibmcos) { - this.ibmcos = ibmcos; - } - - @JsonProperty("managementState") - public String getManagementState() { - return managementState; - } - - @JsonProperty("managementState") - 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; - } - - @JsonProperty("pvc") - public void setPvc(ImageRegistryConfigStoragePVC pvc) { - this.pvc = pvc; - } - - @JsonProperty("s3") - public ImageRegistryConfigStorageS3 getS3() { - return s3; - } - - @JsonProperty("s3") - public void setS3(ImageRegistryConfigStorageS3 s3) { - this.s3 = s3; - } - - @JsonProperty("swift") - public ImageRegistryConfigStorageSwift getSwift() { - return swift; - } - - @JsonProperty("swift") - public void setSwift(ImageRegistryConfigStorageSwift swift) { - this.swift = swift; - } - - @JsonIgnore - public ImageRegistryConfigStorageBuilder edit() { - return new ImageRegistryConfigStorageBuilder(this); - } - - @JsonIgnore - public ImageRegistryConfigStorageBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} 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 deleted file mode 100644 index 5301bd5e56c..00000000000 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryConfigStorageAlibabaOSS.java +++ /dev/null @@ -1,150 +0,0 @@ - -package io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -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.builder.Editable; -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.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "bucket", - "encryption", - "endpointAccessibility", - "region" -}) -@ToString -@EqualsAndHashCode -@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) -}) -@Generated("jsonschema2pojo") -public class ImageRegistryConfigStorageAlibabaOSS implements Editable , 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 LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ImageRegistryConfigStorageAlibabaOSS() { - } - - 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; - } - - @JsonIgnore - public ImageRegistryConfigStorageAlibabaOSSBuilder edit() { - return new ImageRegistryConfigStorageAlibabaOSSBuilder(this); - } - - @JsonIgnore - public ImageRegistryConfigStorageAlibabaOSSBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryConfigStorageEmptyDir.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryConfigStorageEmptyDir.java deleted file mode 100644 index fba63e7ed40..00000000000 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryConfigStorageEmptyDir.java +++ /dev/null @@ -1,83 +0,0 @@ - -package io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -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.builder.Editable; -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.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - -}) -@ToString -@EqualsAndHashCode -@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) -}) -@Generated("jsonschema2pojo") -public class ImageRegistryConfigStorageEmptyDir implements Editable , KubernetesResource -{ - - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - @JsonIgnore - public ImageRegistryConfigStorageEmptyDirBuilder edit() { - return new ImageRegistryConfigStorageEmptyDirBuilder(this); - } - - @JsonIgnore - public ImageRegistryConfigStorageEmptyDirBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryConfigStorageGCS.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryConfigStorageGCS.java deleted file mode 100644 index b3cd2fa621a..00000000000 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryConfigStorageGCS.java +++ /dev/null @@ -1,150 +0,0 @@ - -package io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -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.builder.Editable; -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.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "bucket", - "keyID", - "projectID", - "region" -}) -@ToString -@EqualsAndHashCode -@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) -}) -@Generated("jsonschema2pojo") -public class ImageRegistryConfigStorageGCS implements Editable , KubernetesResource -{ - - @JsonProperty("bucket") - private String bucket; - @JsonProperty("keyID") - private String keyID; - @JsonProperty("projectID") - private String projectID; - @JsonProperty("region") - private String region; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ImageRegistryConfigStorageGCS() { - } - - public ImageRegistryConfigStorageGCS(String bucket, String keyID, String projectID, String region) { - super(); - this.bucket = bucket; - this.keyID = keyID; - this.projectID = projectID; - this.region = region; - } - - @JsonProperty("bucket") - public String getBucket() { - return bucket; - } - - @JsonProperty("bucket") - public void setBucket(String bucket) { - this.bucket = bucket; - } - - @JsonProperty("keyID") - public String getKeyID() { - return keyID; - } - - @JsonProperty("keyID") - public void setKeyID(String keyID) { - this.keyID = keyID; - } - - @JsonProperty("projectID") - public String getProjectID() { - return projectID; - } - - @JsonProperty("projectID") - public void setProjectID(String projectID) { - this.projectID = projectID; - } - - @JsonProperty("region") - public String getRegion() { - return region; - } - - @JsonProperty("region") - public void setRegion(String region) { - this.region = region; - } - - @JsonIgnore - public ImageRegistryConfigStorageGCSBuilder edit() { - return new ImageRegistryConfigStorageGCSBuilder(this); - } - - @JsonIgnore - public ImageRegistryConfigStorageGCSBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryConfigStorageIBMCOS.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryConfigStorageIBMCOS.java deleted file mode 100644 index 35dd9775f30..00000000000 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryConfigStorageIBMCOS.java +++ /dev/null @@ -1,164 +0,0 @@ - -package io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -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.builder.Editable; -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.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "bucket", - "location", - "resourceGroupName", - "resourceKeyCRN", - "serviceInstanceCRN" -}) -@ToString -@EqualsAndHashCode -@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) -}) -@Generated("jsonschema2pojo") -public class ImageRegistryConfigStorageIBMCOS implements Editable , KubernetesResource -{ - - @JsonProperty("bucket") - private String bucket; - @JsonProperty("location") - private String location; - @JsonProperty("resourceGroupName") - private String resourceGroupName; - @JsonProperty("resourceKeyCRN") - private String resourceKeyCRN; - @JsonProperty("serviceInstanceCRN") - private String serviceInstanceCRN; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ImageRegistryConfigStorageIBMCOS() { - } - - public ImageRegistryConfigStorageIBMCOS(String bucket, String location, String resourceGroupName, String resourceKeyCRN, String serviceInstanceCRN) { - super(); - this.bucket = bucket; - this.location = location; - this.resourceGroupName = resourceGroupName; - this.resourceKeyCRN = resourceKeyCRN; - this.serviceInstanceCRN = serviceInstanceCRN; - } - - @JsonProperty("bucket") - public String getBucket() { - return bucket; - } - - @JsonProperty("bucket") - public void setBucket(String bucket) { - this.bucket = bucket; - } - - @JsonProperty("location") - public String getLocation() { - return location; - } - - @JsonProperty("location") - public void setLocation(String location) { - this.location = location; - } - - @JsonProperty("resourceGroupName") - public String getResourceGroupName() { - return resourceGroupName; - } - - @JsonProperty("resourceGroupName") - public void setResourceGroupName(String resourceGroupName) { - this.resourceGroupName = resourceGroupName; - } - - @JsonProperty("resourceKeyCRN") - public String getResourceKeyCRN() { - return resourceKeyCRN; - } - - @JsonProperty("resourceKeyCRN") - public void setResourceKeyCRN(String resourceKeyCRN) { - this.resourceKeyCRN = resourceKeyCRN; - } - - @JsonProperty("serviceInstanceCRN") - public String getServiceInstanceCRN() { - return serviceInstanceCRN; - } - - @JsonProperty("serviceInstanceCRN") - public void setServiceInstanceCRN(String serviceInstanceCRN) { - this.serviceInstanceCRN = serviceInstanceCRN; - } - - @JsonIgnore - public ImageRegistryConfigStorageIBMCOSBuilder edit() { - return new ImageRegistryConfigStorageIBMCOSBuilder(this); - } - - @JsonIgnore - public ImageRegistryConfigStorageIBMCOSBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} 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 deleted file mode 100644 index 50b2c4977b3..00000000000 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryConfigStorageS3.java +++ /dev/null @@ -1,206 +0,0 @@ - -package io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -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.builder.Editable; -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.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "bucket", - "cloudFront", - "encrypt", - "keyID", - "region", - "regionEndpoint", - "trustedCA", - "virtualHostedStyle" -}) -@ToString -@EqualsAndHashCode -@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) -}) -@Generated("jsonschema2pojo") -public class ImageRegistryConfigStorageS3 implements Editable , KubernetesResource -{ - - @JsonProperty("bucket") - private String bucket; - @JsonProperty("cloudFront") - private ImageRegistryConfigStorageS3CloudFront cloudFront; - @JsonProperty("encrypt") - private Boolean encrypt; - @JsonProperty("keyID") - private String keyID; - @JsonProperty("region") - private String region; - @JsonProperty("regionEndpoint") - private String regionEndpoint; - @JsonProperty("trustedCA") - private S3TrustedCASource trustedCA; - @JsonProperty("virtualHostedStyle") - private Boolean virtualHostedStyle; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ImageRegistryConfigStorageS3() { - } - - 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; - this.encrypt = encrypt; - this.keyID = keyID; - this.region = region; - this.regionEndpoint = regionEndpoint; - this.trustedCA = trustedCA; - this.virtualHostedStyle = virtualHostedStyle; - } - - @JsonProperty("bucket") - public String getBucket() { - return bucket; - } - - @JsonProperty("bucket") - public void setBucket(String bucket) { - this.bucket = bucket; - } - - @JsonProperty("cloudFront") - public ImageRegistryConfigStorageS3CloudFront getCloudFront() { - return cloudFront; - } - - @JsonProperty("cloudFront") - public void setCloudFront(ImageRegistryConfigStorageS3CloudFront cloudFront) { - this.cloudFront = cloudFront; - } - - @JsonProperty("encrypt") - public Boolean getEncrypt() { - return encrypt; - } - - @JsonProperty("encrypt") - public void setEncrypt(Boolean encrypt) { - this.encrypt = encrypt; - } - - @JsonProperty("keyID") - public String getKeyID() { - return keyID; - } - - @JsonProperty("keyID") - public void setKeyID(String keyID) { - this.keyID = keyID; - } - - @JsonProperty("region") - public String getRegion() { - return region; - } - - @JsonProperty("region") - public void setRegion(String region) { - this.region = region; - } - - @JsonProperty("regionEndpoint") - public String getRegionEndpoint() { - return regionEndpoint; - } - - @JsonProperty("regionEndpoint") - 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; - } - - @JsonProperty("virtualHostedStyle") - public void setVirtualHostedStyle(Boolean virtualHostedStyle) { - this.virtualHostedStyle = virtualHostedStyle; - } - - @JsonIgnore - public ImageRegistryConfigStorageS3Builder edit() { - return new ImageRegistryConfigStorageS3Builder(this); - } - - @JsonIgnore - public ImageRegistryConfigStorageS3Builder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryConfigStorageS3CloudFront.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryConfigStorageS3CloudFront.java deleted file mode 100644 index b3d1cedc8da..00000000000 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryConfigStorageS3CloudFront.java +++ /dev/null @@ -1,152 +0,0 @@ - -package io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -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.builder.Editable; -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.fabric8.kubernetes.api.model.SecretKeySelector; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "baseURL", - "duration", - "keypairID", - "privateKey" -}) -@ToString -@EqualsAndHashCode -@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) -}) -@Generated("jsonschema2pojo") -public class ImageRegistryConfigStorageS3CloudFront implements Editable , KubernetesResource -{ - - @JsonProperty("baseURL") - private String baseURL; - @JsonProperty("duration") - private Duration duration; - @JsonProperty("keypairID") - private String keypairID; - @JsonProperty("privateKey") - private SecretKeySelector privateKey; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ImageRegistryConfigStorageS3CloudFront() { - } - - public ImageRegistryConfigStorageS3CloudFront(String baseURL, Duration duration, String keypairID, SecretKeySelector privateKey) { - super(); - this.baseURL = baseURL; - this.duration = duration; - this.keypairID = keypairID; - this.privateKey = privateKey; - } - - @JsonProperty("baseURL") - public String getBaseURL() { - return baseURL; - } - - @JsonProperty("baseURL") - public void setBaseURL(String baseURL) { - this.baseURL = baseURL; - } - - @JsonProperty("duration") - public Duration getDuration() { - return duration; - } - - @JsonProperty("duration") - public void setDuration(Duration duration) { - this.duration = duration; - } - - @JsonProperty("keypairID") - public String getKeypairID() { - return keypairID; - } - - @JsonProperty("keypairID") - public void setKeypairID(String keypairID) { - this.keypairID = keypairID; - } - - @JsonProperty("privateKey") - public SecretKeySelector getPrivateKey() { - return privateKey; - } - - @JsonProperty("privateKey") - public void setPrivateKey(SecretKeySelector privateKey) { - this.privateKey = privateKey; - } - - @JsonIgnore - public ImageRegistryConfigStorageS3CloudFrontBuilder edit() { - return new ImageRegistryConfigStorageS3CloudFrontBuilder(this); - } - - @JsonIgnore - public ImageRegistryConfigStorageS3CloudFrontBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryConfigStorageSwift.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryConfigStorageSwift.java deleted file mode 100644 index dce9e410038..00000000000 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryConfigStorageSwift.java +++ /dev/null @@ -1,206 +0,0 @@ - -package io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -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.builder.Editable; -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.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "authURL", - "authVersion", - "container", - "domain", - "domainID", - "regionName", - "tenant", - "tenantID" -}) -@ToString -@EqualsAndHashCode -@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) -}) -@Generated("jsonschema2pojo") -public class ImageRegistryConfigStorageSwift implements Editable , KubernetesResource -{ - - @JsonProperty("authURL") - private String authURL; - @JsonProperty("authVersion") - private String authVersion; - @JsonProperty("container") - private String container; - @JsonProperty("domain") - private String domain; - @JsonProperty("domainID") - private String domainID; - @JsonProperty("regionName") - private String regionName; - @JsonProperty("tenant") - private String tenant; - @JsonProperty("tenantID") - private String tenantID; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ImageRegistryConfigStorageSwift() { - } - - public ImageRegistryConfigStorageSwift(String authURL, String authVersion, String container, String domain, String domainID, String regionName, String tenant, String tenantID) { - super(); - this.authURL = authURL; - this.authVersion = authVersion; - this.container = container; - this.domain = domain; - this.domainID = domainID; - this.regionName = regionName; - this.tenant = tenant; - this.tenantID = tenantID; - } - - @JsonProperty("authURL") - public String getAuthURL() { - return authURL; - } - - @JsonProperty("authURL") - public void setAuthURL(String authURL) { - this.authURL = authURL; - } - - @JsonProperty("authVersion") - public String getAuthVersion() { - return authVersion; - } - - @JsonProperty("authVersion") - public void setAuthVersion(String authVersion) { - this.authVersion = authVersion; - } - - @JsonProperty("container") - public String getContainer() { - return container; - } - - @JsonProperty("container") - public void setContainer(String container) { - this.container = container; - } - - @JsonProperty("domain") - public String getDomain() { - return domain; - } - - @JsonProperty("domain") - public void setDomain(String domain) { - this.domain = domain; - } - - @JsonProperty("domainID") - public String getDomainID() { - return domainID; - } - - @JsonProperty("domainID") - public void setDomainID(String domainID) { - this.domainID = domainID; - } - - @JsonProperty("regionName") - public String getRegionName() { - return regionName; - } - - @JsonProperty("regionName") - public void setRegionName(String regionName) { - this.regionName = regionName; - } - - @JsonProperty("tenant") - public String getTenant() { - return tenant; - } - - @JsonProperty("tenant") - public void setTenant(String tenant) { - this.tenant = tenant; - } - - @JsonProperty("tenantID") - public String getTenantID() { - return tenantID; - } - - @JsonProperty("tenantID") - public void setTenantID(String tenantID) { - this.tenantID = tenantID; - } - - @JsonIgnore - public ImageRegistryConfigStorageSwiftBuilder edit() { - return new ImageRegistryConfigStorageSwiftBuilder(this); - } - - @JsonIgnore - public ImageRegistryConfigStorageSwiftBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} 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 deleted file mode 100644 index 4e5c4786dbe..00000000000 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistrySpec.java +++ /dev/null @@ -1,404 +0,0 @@ - -package io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -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.builder.Editable; -import io.fabric8.kubernetes.api.model.Affinity; -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.Toleration; -import io.fabric8.kubernetes.api.model.TopologySpreadConstraint; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "affinity", - "defaultRoute", - "disableRedirect", - "httpSecret", - "logLevel", - "logging", - "managementState", - "nodeSelector", - "observedConfig", - "operatorLogLevel", - "proxy", - "readOnly", - "replicas", - "requests", - "resources", - "rolloutStrategy", - "routes", - "storage", - "tolerations", - "topologySpreadConstraints", - "unsupportedConfigOverrides" -}) -@ToString -@EqualsAndHashCode -@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(io.fabric8.kubernetes.api.model.ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class ImageRegistrySpec implements Editable , KubernetesResource -{ - - @JsonProperty("affinity") - private Affinity affinity; - @JsonProperty("defaultRoute") - private Boolean defaultRoute; - @JsonProperty("disableRedirect") - private Boolean disableRedirect; - @JsonProperty("httpSecret") - private java.lang.String httpSecret; - @JsonProperty("logLevel") - private java.lang.String logLevel; - @JsonProperty("logging") - private Long logging; - @JsonProperty("managementState") - private java.lang.String managementState; - @JsonProperty("nodeSelector") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Map nodeSelector = new LinkedHashMap<>(); - @JsonProperty("observedConfig") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Map observedConfig = new LinkedHashMap<>(); - @JsonProperty("operatorLogLevel") - private java.lang.String operatorLogLevel; - @JsonProperty("proxy") - private ImageRegistryConfigProxy proxy; - @JsonProperty("readOnly") - private Boolean readOnly; - @JsonProperty("replicas") - private Integer replicas; - @JsonProperty("requests") - private ImageRegistryConfigRequests requests; - @JsonProperty("resources") - private io.fabric8.kubernetes.api.model.ResourceRequirements resources; - @JsonProperty("rolloutStrategy") - private java.lang.String rolloutStrategy; - @JsonProperty("routes") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List routes = new ArrayList<>(); - @JsonProperty("storage") - private ImageRegistryConfigStorage storage; - @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<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ImageRegistrySpec() { - } - - 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; - this.disableRedirect = disableRedirect; - this.httpSecret = httpSecret; - this.logLevel = logLevel; - this.logging = logging; - this.managementState = managementState; - this.nodeSelector = nodeSelector; - this.observedConfig = observedConfig; - this.operatorLogLevel = operatorLogLevel; - this.proxy = proxy; - this.readOnly = readOnly; - this.replicas = replicas; - this.requests = requests; - this.resources = resources; - this.rolloutStrategy = rolloutStrategy; - this.routes = routes; - this.storage = storage; - this.tolerations = tolerations; - this.topologySpreadConstraints = topologySpreadConstraints; - this.unsupportedConfigOverrides = unsupportedConfigOverrides; - } - - @JsonProperty("affinity") - public Affinity getAffinity() { - return affinity; - } - - @JsonProperty("affinity") - public void setAffinity(Affinity affinity) { - this.affinity = affinity; - } - - @JsonProperty("defaultRoute") - public Boolean getDefaultRoute() { - return defaultRoute; - } - - @JsonProperty("defaultRoute") - public void setDefaultRoute(Boolean defaultRoute) { - this.defaultRoute = defaultRoute; - } - - @JsonProperty("disableRedirect") - public Boolean getDisableRedirect() { - return disableRedirect; - } - - @JsonProperty("disableRedirect") - public void setDisableRedirect(Boolean disableRedirect) { - this.disableRedirect = disableRedirect; - } - - @JsonProperty("httpSecret") - public java.lang.String getHttpSecret() { - return httpSecret; - } - - @JsonProperty("httpSecret") - public void setHttpSecret(java.lang.String httpSecret) { - this.httpSecret = httpSecret; - } - - @JsonProperty("logLevel") - public java.lang.String getLogLevel() { - return logLevel; - } - - @JsonProperty("logLevel") - public void setLogLevel(java.lang.String logLevel) { - this.logLevel = logLevel; - } - - @JsonProperty("logging") - public Long getLogging() { - return logging; - } - - @JsonProperty("logging") - public void setLogging(Long logging) { - this.logging = logging; - } - - @JsonProperty("managementState") - public java.lang.String getManagementState() { - return managementState; - } - - @JsonProperty("managementState") - public void setManagementState(java.lang.String managementState) { - this.managementState = managementState; - } - - @JsonProperty("nodeSelector") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public Map getNodeSelector() { - return nodeSelector; - } - - @JsonProperty("nodeSelector") - public void setNodeSelector(Map nodeSelector) { - this.nodeSelector = nodeSelector; - } - - @JsonProperty("observedConfig") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public Map getObservedConfig() { - return observedConfig; - } - - @JsonProperty("observedConfig") - public void setObservedConfig(Map observedConfig) { - this.observedConfig = observedConfig; - } - - @JsonProperty("operatorLogLevel") - public java.lang.String getOperatorLogLevel() { - return operatorLogLevel; - } - - @JsonProperty("operatorLogLevel") - public void setOperatorLogLevel(java.lang.String operatorLogLevel) { - this.operatorLogLevel = operatorLogLevel; - } - - @JsonProperty("proxy") - public ImageRegistryConfigProxy getProxy() { - return proxy; - } - - @JsonProperty("proxy") - public void setProxy(ImageRegistryConfigProxy proxy) { - this.proxy = proxy; - } - - @JsonProperty("readOnly") - public Boolean getReadOnly() { - return readOnly; - } - - @JsonProperty("readOnly") - public void setReadOnly(Boolean readOnly) { - this.readOnly = readOnly; - } - - @JsonProperty("replicas") - public Integer getReplicas() { - return replicas; - } - - @JsonProperty("replicas") - public void setReplicas(Integer replicas) { - this.replicas = replicas; - } - - @JsonProperty("requests") - public ImageRegistryConfigRequests getRequests() { - return requests; - } - - @JsonProperty("requests") - public void setRequests(ImageRegistryConfigRequests requests) { - this.requests = requests; - } - - @JsonProperty("resources") - public io.fabric8.kubernetes.api.model.ResourceRequirements getResources() { - return resources; - } - - @JsonProperty("resources") - public void setResources(io.fabric8.kubernetes.api.model.ResourceRequirements resources) { - this.resources = resources; - } - - @JsonProperty("rolloutStrategy") - public java.lang.String getRolloutStrategy() { - return rolloutStrategy; - } - - @JsonProperty("rolloutStrategy") - public void setRolloutStrategy(java.lang.String rolloutStrategy) { - this.rolloutStrategy = rolloutStrategy; - } - - @JsonProperty("routes") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getRoutes() { - return routes; - } - - @JsonProperty("routes") - public void setRoutes(List routes) { - this.routes = routes; - } - - @JsonProperty("storage") - public ImageRegistryConfigStorage getStorage() { - return storage; - } - - @JsonProperty("storage") - public void setStorage(ImageRegistryConfigStorage storage) { - this.storage = storage; - } - - @JsonProperty("tolerations") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getTolerations() { - return tolerations; - } - - @JsonProperty("tolerations") - public void setTolerations(List tolerations) { - this.tolerations = tolerations; - } - - @JsonProperty("topologySpreadConstraints") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getTopologySpreadConstraints() { - return topologySpreadConstraints; - } - - @JsonProperty("topologySpreadConstraints") - public void setTopologySpreadConstraints(List topologySpreadConstraints) { - this.topologySpreadConstraints = topologySpreadConstraints; - } - - @JsonProperty("unsupportedConfigOverrides") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public Map getUnsupportedConfigOverrides() { - return unsupportedConfigOverrides; - } - - @JsonProperty("unsupportedConfigOverrides") - public void setUnsupportedConfigOverrides(Map unsupportedConfigOverrides) { - this.unsupportedConfigOverrides = unsupportedConfigOverrides; - } - - @JsonIgnore - public ImageRegistrySpecBuilder edit() { - return new ImageRegistrySpecBuilder(this); - } - - @JsonIgnore - public ImageRegistrySpecBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(java.lang.String name, java.lang.Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/EgressRouter.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BMCEventSubscription.java similarity index 79% rename from kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/EgressRouter.java rename to kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BMCEventSubscription.java index 397e032ad9e..3023ddafe86 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/EgressRouter.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BMCEventSubscription.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.miscellaneous.network.operator.v1; +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; import java.util.LinkedHashMap; import java.util.Map; @@ -18,6 +18,7 @@ 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.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -48,7 +49,7 @@ "" }) @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(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @@ -61,10 +62,10 @@ @TemplateTransformations({ @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) }) -@Version("v1") -@Group("network.operator.openshift.io") +@Version("v1alpha1") +@Group("metal3.io") @Generated("jsonschema2pojo") -public class EgressRouter implements Editable , HasMetadata, Namespaced +public class BMCEventSubscription implements Editable , HasMetadata, Namespaced { /** @@ -73,20 +74,20 @@ public class EgressRouter implements Editable , HasMetadata * */ @JsonProperty("apiVersion") - private String apiVersion = "network.operator.openshift.io/v1"; + private String apiVersion = "metal3.io/v1alpha1"; /** * * (Required) * */ @JsonProperty("kind") - private String kind = "EgressRouter"; + private String kind = "BMCEventSubscription"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("spec") - private EgressRouterSpec spec; + private BMCEventSubscriptionSpec spec; @JsonProperty("status") - private EgressRouterStatus status; + private BMCEventSubscriptionStatus status; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -94,10 +95,10 @@ public class EgressRouter implements Editable , HasMetadata * No args constructor for use in serialization * */ - public EgressRouter() { + public BMCEventSubscription() { } - public EgressRouter(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, EgressRouterSpec spec, EgressRouterStatus status) { + public BMCEventSubscription(String apiVersion, String kind, ObjectMeta metadata, BMCEventSubscriptionSpec spec, BMCEventSubscriptionStatus status) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -147,42 +148,42 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } @JsonProperty("spec") - public EgressRouterSpec getSpec() { + public BMCEventSubscriptionSpec getSpec() { return spec; } @JsonProperty("spec") - public void setSpec(EgressRouterSpec spec) { + public void setSpec(BMCEventSubscriptionSpec spec) { this.spec = spec; } @JsonProperty("status") - public EgressRouterStatus getStatus() { + public BMCEventSubscriptionStatus getStatus() { return status; } @JsonProperty("status") - public void setStatus(EgressRouterStatus status) { + public void setStatus(BMCEventSubscriptionStatus status) { this.status = status; } @JsonIgnore - public EgressRouterBuilder edit() { - return new EgressRouterBuilder(this); + public BMCEventSubscriptionBuilder edit() { + return new BMCEventSubscriptionBuilder(this); } @JsonIgnore - public EgressRouterBuilder toBuilder() { + public BMCEventSubscriptionBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BMCEventSubscriptionList.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BMCEventSubscriptionList.java new file mode 100644 index 00000000000..6b1aa3b949b --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BMCEventSubscriptionList.java @@ -0,0 +1,195 @@ + +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +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.builder.Editable; +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.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 +@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("metal3.io") +@Generated("jsonschema2pojo") +public class BMCEventSubscriptionList implements Editable , KubernetesResource, KubernetesResourceList +{ + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + private String apiVersion = "metal3.io/v1alpha1"; + @JsonProperty("items") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List items = new ArrayList<>(); + /** + * + * (Required) + * + */ + @JsonProperty("kind") + private String kind = "BMCEventSubscriptionList"; + @JsonProperty("metadata") + private ListMeta metadata; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public BMCEventSubscriptionList() { + } + + public BMCEventSubscriptionList(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") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + 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; + } + + @JsonIgnore + public BMCEventSubscriptionListBuilder edit() { + return new BMCEventSubscriptionListBuilder(this); + } + + @JsonIgnore + public BMCEventSubscriptionListBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BMCEventSubscriptionSpec.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BMCEventSubscriptionSpec.java new file mode 100644 index 00000000000..3d5208a050a --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BMCEventSubscriptionSpec.java @@ -0,0 +1,150 @@ + +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "context", + "destination", + "hostName", + "httpHeadersRef" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class BMCEventSubscriptionSpec implements Editable , KubernetesResource +{ + + @JsonProperty("context") + private String context; + @JsonProperty("destination") + private String destination; + @JsonProperty("hostName") + private String hostName; + @JsonProperty("httpHeadersRef") + private BMCEventSubscriptionSpecHttpHeadersRef httpHeadersRef; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public BMCEventSubscriptionSpec() { + } + + public BMCEventSubscriptionSpec(String context, String destination, String hostName, BMCEventSubscriptionSpecHttpHeadersRef httpHeadersRef) { + super(); + this.context = context; + this.destination = destination; + this.hostName = hostName; + this.httpHeadersRef = httpHeadersRef; + } + + @JsonProperty("context") + public String getContext() { + return context; + } + + @JsonProperty("context") + public void setContext(String context) { + this.context = context; + } + + @JsonProperty("destination") + public String getDestination() { + return destination; + } + + @JsonProperty("destination") + public void setDestination(String destination) { + this.destination = destination; + } + + @JsonProperty("hostName") + public String getHostName() { + return hostName; + } + + @JsonProperty("hostName") + public void setHostName(String hostName) { + this.hostName = hostName; + } + + @JsonProperty("httpHeadersRef") + public BMCEventSubscriptionSpecHttpHeadersRef getHttpHeadersRef() { + return httpHeadersRef; + } + + @JsonProperty("httpHeadersRef") + public void setHttpHeadersRef(BMCEventSubscriptionSpecHttpHeadersRef httpHeadersRef) { + this.httpHeadersRef = httpHeadersRef; + } + + @JsonIgnore + public BMCEventSubscriptionSpecBuilder edit() { + return new BMCEventSubscriptionSpecBuilder(this); + } + + @JsonIgnore + public BMCEventSubscriptionSpecBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BMCEventSubscriptionSpecHttpHeadersRef.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BMCEventSubscriptionSpecHttpHeadersRef.java new file mode 100644 index 00000000000..013d8884503 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BMCEventSubscriptionSpecHttpHeadersRef.java @@ -0,0 +1,122 @@ + +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "name", + "namespace" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class BMCEventSubscriptionSpecHttpHeadersRef implements Editable , KubernetesResource +{ + + @JsonProperty("name") + private String name; + @JsonProperty("namespace") + private String namespace; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public BMCEventSubscriptionSpecHttpHeadersRef() { + } + + public BMCEventSubscriptionSpecHttpHeadersRef(String name, String namespace) { + super(); + this.name = name; + this.namespace = namespace; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonProperty("namespace") + public String getNamespace() { + return namespace; + } + + @JsonProperty("namespace") + public void setNamespace(String namespace) { + this.namespace = namespace; + } + + @JsonIgnore + public BMCEventSubscriptionSpecHttpHeadersRefBuilder edit() { + return new BMCEventSubscriptionSpecHttpHeadersRefBuilder(this); + } + + @JsonIgnore + public BMCEventSubscriptionSpecHttpHeadersRefBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BMCEventSubscriptionStatus.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BMCEventSubscriptionStatus.java new file mode 100644 index 00000000000..3b34b8e1212 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BMCEventSubscriptionStatus.java @@ -0,0 +1,122 @@ + +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "error", + "subscriptionID" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class BMCEventSubscriptionStatus implements Editable , KubernetesResource +{ + + @JsonProperty("error") + private String error; + @JsonProperty("subscriptionID") + private String subscriptionID; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public BMCEventSubscriptionStatus() { + } + + public BMCEventSubscriptionStatus(String error, String subscriptionID) { + super(); + this.error = error; + this.subscriptionID = subscriptionID; + } + + @JsonProperty("error") + public String getError() { + return error; + } + + @JsonProperty("error") + public void setError(String error) { + this.error = error; + } + + @JsonProperty("subscriptionID") + public String getSubscriptionID() { + return subscriptionID; + } + + @JsonProperty("subscriptionID") + public void setSubscriptionID(String subscriptionID) { + this.subscriptionID = subscriptionID; + } + + @JsonIgnore + public BMCEventSubscriptionStatusBuilder edit() { + return new BMCEventSubscriptionStatusBuilder(this); + } + + @JsonIgnore + public BMCEventSubscriptionStatusBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHost.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHost.java index 8ddaaf2d690..55e82a7fca7 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHost.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHost.java @@ -18,6 +18,7 @@ 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.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -48,7 +49,7 @@ "" }) @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(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @@ -82,7 +83,7 @@ public class BareMetalHost implements Editable , HasMetada @JsonProperty("kind") private String kind = "BareMetalHost"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("spec") private BareMetalHostSpec spec; @JsonProperty("status") @@ -97,7 +98,7 @@ public class BareMetalHost implements Editable , HasMetada public BareMetalHost() { } - public BareMetalHost(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, BareMetalHostSpec spec, BareMetalHostStatus status) { + public BareMetalHost(String apiVersion, String kind, ObjectMeta metadata, BareMetalHostSpec spec, BareMetalHostStatus status) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -147,12 +148,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostSpec.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostSpec.java index b37e64266aa..770983d4058 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostSpec.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostSpec.java @@ -20,11 +20,10 @@ 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.SecretReference; -import io.fabric8.kubernetes.api.model.Taint; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; import lombok.EqualsAndHashCode; @@ -68,7 +67,7 @@ @BuildableReference(PodTemplateSpec.class), @BuildableReference(ResourceRequirements.class), @BuildableReference(IntOrString.class), - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class), + @BuildableReference(ObjectReference.class), @BuildableReference(LocalObjectReference.class), @BuildableReference(PersistentVolumeClaim.class) }) @@ -81,42 +80,42 @@ public class BareMetalHostSpec implements Editable , K @JsonProperty("automatedCleaningMode") private String automatedCleaningMode; @JsonProperty("bmc") - private BMCDetails bmc; + private BareMetalHostSpecBmc bmc; @JsonProperty("bootMACAddress") private String bootMACAddress; @JsonProperty("bootMode") private String bootMode; @JsonProperty("consumerRef") - private io.fabric8.kubernetes.api.model.ObjectReference consumerRef; + private BareMetalHostSpecConsumerRef consumerRef; @JsonProperty("customDeploy") - private CustomDeploy customDeploy; + private BareMetalHostSpecCustomDeploy customDeploy; @JsonProperty("description") private String description; @JsonProperty("externallyProvisioned") private Boolean externallyProvisioned; @JsonProperty("firmware") - private FirmwareConfig firmware; + private BareMetalHostSpecFirmware firmware; @JsonProperty("hardwareProfile") private String hardwareProfile; @JsonProperty("image") - private Image image; + private BareMetalHostSpecImage image; @JsonProperty("metaData") - private SecretReference metaData; + private BareMetalHostSpecMetaData metaData; @JsonProperty("networkData") - private SecretReference networkData; + private BareMetalHostSpecNetworkData networkData; @JsonProperty("online") private Boolean online; @JsonProperty("preprovisioningNetworkDataName") private String preprovisioningNetworkDataName; @JsonProperty("raid") - private RAIDConfig raid; + private BareMetalHostSpecRaid raid; @JsonProperty("rootDeviceHints") - private RootDeviceHints rootDeviceHints; + private BareMetalHostSpecRootDeviceHints rootDeviceHints; @JsonProperty("taints") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List taints = new ArrayList<>(); + private List taints = new ArrayList<>(); @JsonProperty("userData") - private SecretReference userData; + private BareMetalHostSpecUserData userData; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -127,7 +126,7 @@ public class BareMetalHostSpec implements Editable , K public BareMetalHostSpec() { } - public BareMetalHostSpec(String architecture, String automatedCleaningMode, BMCDetails bmc, String bootMACAddress, String bootMode, io.fabric8.kubernetes.api.model.ObjectReference consumerRef, CustomDeploy customDeploy, String description, Boolean externallyProvisioned, FirmwareConfig firmware, String hardwareProfile, Image image, SecretReference metaData, SecretReference networkData, Boolean online, String preprovisioningNetworkDataName, RAIDConfig raid, RootDeviceHints rootDeviceHints, List taints, SecretReference userData) { + public BareMetalHostSpec(String architecture, String automatedCleaningMode, BareMetalHostSpecBmc bmc, String bootMACAddress, String bootMode, BareMetalHostSpecConsumerRef consumerRef, BareMetalHostSpecCustomDeploy customDeploy, String description, Boolean externallyProvisioned, BareMetalHostSpecFirmware firmware, String hardwareProfile, BareMetalHostSpecImage image, BareMetalHostSpecMetaData metaData, BareMetalHostSpecNetworkData networkData, Boolean online, String preprovisioningNetworkDataName, BareMetalHostSpecRaid raid, BareMetalHostSpecRootDeviceHints rootDeviceHints, List taints, BareMetalHostSpecUserData userData) { super(); this.architecture = architecture; this.automatedCleaningMode = automatedCleaningMode; @@ -172,12 +171,12 @@ public void setAutomatedCleaningMode(String automatedCleaningMode) { } @JsonProperty("bmc") - public BMCDetails getBmc() { + public BareMetalHostSpecBmc getBmc() { return bmc; } @JsonProperty("bmc") - public void setBmc(BMCDetails bmc) { + public void setBmc(BareMetalHostSpecBmc bmc) { this.bmc = bmc; } @@ -202,22 +201,22 @@ public void setBootMode(String bootMode) { } @JsonProperty("consumerRef") - public io.fabric8.kubernetes.api.model.ObjectReference getConsumerRef() { + public BareMetalHostSpecConsumerRef getConsumerRef() { return consumerRef; } @JsonProperty("consumerRef") - public void setConsumerRef(io.fabric8.kubernetes.api.model.ObjectReference consumerRef) { + public void setConsumerRef(BareMetalHostSpecConsumerRef consumerRef) { this.consumerRef = consumerRef; } @JsonProperty("customDeploy") - public CustomDeploy getCustomDeploy() { + public BareMetalHostSpecCustomDeploy getCustomDeploy() { return customDeploy; } @JsonProperty("customDeploy") - public void setCustomDeploy(CustomDeploy customDeploy) { + public void setCustomDeploy(BareMetalHostSpecCustomDeploy customDeploy) { this.customDeploy = customDeploy; } @@ -242,12 +241,12 @@ public void setExternallyProvisioned(Boolean externallyProvisioned) { } @JsonProperty("firmware") - public FirmwareConfig getFirmware() { + public BareMetalHostSpecFirmware getFirmware() { return firmware; } @JsonProperty("firmware") - public void setFirmware(FirmwareConfig firmware) { + public void setFirmware(BareMetalHostSpecFirmware firmware) { this.firmware = firmware; } @@ -262,32 +261,32 @@ public void setHardwareProfile(String hardwareProfile) { } @JsonProperty("image") - public Image getImage() { + public BareMetalHostSpecImage getImage() { return image; } @JsonProperty("image") - public void setImage(Image image) { + public void setImage(BareMetalHostSpecImage image) { this.image = image; } @JsonProperty("metaData") - public SecretReference getMetaData() { + public BareMetalHostSpecMetaData getMetaData() { return metaData; } @JsonProperty("metaData") - public void setMetaData(SecretReference metaData) { + public void setMetaData(BareMetalHostSpecMetaData metaData) { this.metaData = metaData; } @JsonProperty("networkData") - public SecretReference getNetworkData() { + public BareMetalHostSpecNetworkData getNetworkData() { return networkData; } @JsonProperty("networkData") - public void setNetworkData(SecretReference networkData) { + public void setNetworkData(BareMetalHostSpecNetworkData networkData) { this.networkData = networkData; } @@ -312,43 +311,43 @@ public void setPreprovisioningNetworkDataName(String preprovisioningNetworkDataN } @JsonProperty("raid") - public RAIDConfig getRaid() { + public BareMetalHostSpecRaid getRaid() { return raid; } @JsonProperty("raid") - public void setRaid(RAIDConfig raid) { + public void setRaid(BareMetalHostSpecRaid raid) { this.raid = raid; } @JsonProperty("rootDeviceHints") - public RootDeviceHints getRootDeviceHints() { + public BareMetalHostSpecRootDeviceHints getRootDeviceHints() { return rootDeviceHints; } @JsonProperty("rootDeviceHints") - public void setRootDeviceHints(RootDeviceHints rootDeviceHints) { + public void setRootDeviceHints(BareMetalHostSpecRootDeviceHints rootDeviceHints) { this.rootDeviceHints = rootDeviceHints; } @JsonProperty("taints") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getTaints() { + public List getTaints() { return taints; } @JsonProperty("taints") - public void setTaints(List taints) { + public void setTaints(List taints) { this.taints = taints; } @JsonProperty("userData") - public SecretReference getUserData() { + public BareMetalHostSpecUserData getUserData() { return userData; } @JsonProperty("userData") - public void setUserData(SecretReference userData) { + public void setUserData(BareMetalHostSpecUserData userData) { this.userData = userData; } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BMCDetails.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostSpecBmc.java similarity index 91% rename from kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BMCDetails.java rename to kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostSpecBmc.java index 7d91594ebc7..ba4f84060cc 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BMCDetails.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostSpecBmc.java @@ -53,7 +53,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class BMCDetails implements Editable , KubernetesResource +public class BareMetalHostSpecBmc implements Editable , KubernetesResource { @JsonProperty("address") @@ -69,10 +69,10 @@ public class BMCDetails implements Editable , KubernetesResou * No args constructor for use in serialization * */ - public BMCDetails() { + public BareMetalHostSpecBmc() { } - public BMCDetails(String address, String credentialsName, Boolean disableCertificateVerification) { + public BareMetalHostSpecBmc(String address, String credentialsName, Boolean disableCertificateVerification) { super(); this.address = address; this.credentialsName = credentialsName; @@ -110,12 +110,12 @@ public void setDisableCertificateVerification(Boolean disableCertificateVerifica } @JsonIgnore - public BMCDetailsBuilder edit() { - return new BMCDetailsBuilder(this); + public BareMetalHostSpecBmcBuilder edit() { + return new BareMetalHostSpecBmcBuilder(this); } @JsonIgnore - public BMCDetailsBuilder toBuilder() { + public BareMetalHostSpecBmcBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostSpecConsumerRef.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostSpecConsumerRef.java new file mode 100644 index 00000000000..407faf7bc0e --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostSpecConsumerRef.java @@ -0,0 +1,192 @@ + +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "fieldPath", + "name", + "namespace", + "resourceVersion", + "uid" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class BareMetalHostSpecConsumerRef implements Editable , KubernetesResource +{ + + @JsonProperty("apiVersion") + private String apiVersion; + @JsonProperty("fieldPath") + private String fieldPath; + @JsonProperty("kind") + private String kind; + @JsonProperty("name") + private String name; + @JsonProperty("namespace") + private String namespace; + @JsonProperty("resourceVersion") + private String resourceVersion; + @JsonProperty("uid") + private String uid; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public BareMetalHostSpecConsumerRef() { + } + + public BareMetalHostSpecConsumerRef(String apiVersion, String fieldPath, String kind, String name, String namespace, String resourceVersion, String uid) { + super(); + this.apiVersion = apiVersion; + this.fieldPath = fieldPath; + this.kind = kind; + this.name = name; + this.namespace = namespace; + this.resourceVersion = resourceVersion; + this.uid = uid; + } + + @JsonProperty("apiVersion") + public String getApiVersion() { + return apiVersion; + } + + @JsonProperty("apiVersion") + public void setApiVersion(String apiVersion) { + this.apiVersion = apiVersion; + } + + @JsonProperty("fieldPath") + public String getFieldPath() { + return fieldPath; + } + + @JsonProperty("fieldPath") + public void setFieldPath(String fieldPath) { + this.fieldPath = fieldPath; + } + + @JsonProperty("kind") + public String getKind() { + return kind; + } + + @JsonProperty("kind") + public void setKind(String kind) { + this.kind = kind; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonProperty("namespace") + public String getNamespace() { + return namespace; + } + + @JsonProperty("namespace") + public void setNamespace(String namespace) { + this.namespace = namespace; + } + + @JsonProperty("resourceVersion") + public String getResourceVersion() { + return resourceVersion; + } + + @JsonProperty("resourceVersion") + public void setResourceVersion(String resourceVersion) { + this.resourceVersion = resourceVersion; + } + + @JsonProperty("uid") + public String getUid() { + return uid; + } + + @JsonProperty("uid") + public void setUid(String uid) { + this.uid = uid; + } + + @JsonIgnore + public BareMetalHostSpecConsumerRefBuilder edit() { + return new BareMetalHostSpecConsumerRefBuilder(this); + } + + @JsonIgnore + public BareMetalHostSpecConsumerRefBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/CustomDeploy.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostSpecCustomDeploy.java similarity index 88% rename from kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/CustomDeploy.java rename to kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostSpecCustomDeploy.java index 11351489f42..bdc6885d74a 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/CustomDeploy.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostSpecCustomDeploy.java @@ -51,7 +51,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class CustomDeploy implements Editable , KubernetesResource +public class BareMetalHostSpecCustomDeploy implements Editable , KubernetesResource { @JsonProperty("method") @@ -63,10 +63,10 @@ public class CustomDeploy implements Editable , KubernetesR * No args constructor for use in serialization * */ - public CustomDeploy() { + public BareMetalHostSpecCustomDeploy() { } - public CustomDeploy(String method) { + public BareMetalHostSpecCustomDeploy(String method) { super(); this.method = method; } @@ -82,12 +82,12 @@ public void setMethod(String method) { } @JsonIgnore - public CustomDeployBuilder edit() { - return new CustomDeployBuilder(this); + public BareMetalHostSpecCustomDeployBuilder edit() { + return new BareMetalHostSpecCustomDeployBuilder(this); } @JsonIgnore - public CustomDeployBuilder toBuilder() { + public BareMetalHostSpecCustomDeployBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/FirmwareConfig.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostSpecFirmware.java similarity index 90% rename from kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/FirmwareConfig.java rename to kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostSpecFirmware.java index 86d9e27d1b7..f9551b4719a 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/FirmwareConfig.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostSpecFirmware.java @@ -53,7 +53,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class FirmwareConfig implements Editable , KubernetesResource +public class BareMetalHostSpecFirmware implements Editable , KubernetesResource { @JsonProperty("simultaneousMultithreadingEnabled") @@ -69,10 +69,10 @@ public class FirmwareConfig implements Editable , Kuberne * No args constructor for use in serialization * */ - public FirmwareConfig() { + public BareMetalHostSpecFirmware() { } - public FirmwareConfig(Boolean simultaneousMultithreadingEnabled, Boolean sriovEnabled, Boolean virtualizationEnabled) { + public BareMetalHostSpecFirmware(Boolean simultaneousMultithreadingEnabled, Boolean sriovEnabled, Boolean virtualizationEnabled) { super(); this.simultaneousMultithreadingEnabled = simultaneousMultithreadingEnabled; this.sriovEnabled = sriovEnabled; @@ -110,12 +110,12 @@ public void setVirtualizationEnabled(Boolean virtualizationEnabled) { } @JsonIgnore - public FirmwareConfigBuilder edit() { - return new FirmwareConfigBuilder(this); + public BareMetalHostSpecFirmwareBuilder edit() { + return new BareMetalHostSpecFirmwareBuilder(this); } @JsonIgnore - public FirmwareConfigBuilder toBuilder() { + public BareMetalHostSpecFirmwareBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/Image.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostSpecImage.java similarity index 91% rename from kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/Image.java rename to kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostSpecImage.java index 136c899d458..80608120a04 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/Image.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostSpecImage.java @@ -54,7 +54,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class Image implements Editable , KubernetesResource +public class BareMetalHostSpecImage implements Editable , KubernetesResource { @JsonProperty("checksum") @@ -72,10 +72,10 @@ public class Image implements Editable , KubernetesResource * No args constructor for use in serialization * */ - public Image() { + public BareMetalHostSpecImage() { } - public Image(String checksum, String checksumType, String format, String url) { + public BareMetalHostSpecImage(String checksum, String checksumType, String format, String url) { super(); this.checksum = checksum; this.checksumType = checksumType; @@ -124,12 +124,12 @@ public void setUrl(String url) { } @JsonIgnore - public ImageBuilder edit() { - return new ImageBuilder(this); + public BareMetalHostSpecImageBuilder edit() { + return new BareMetalHostSpecImageBuilder(this); } @JsonIgnore - public ImageBuilder toBuilder() { + public BareMetalHostSpecImageBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ServiceAccountReference.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostSpecMetaData.java similarity index 88% rename from kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ServiceAccountReference.java rename to kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostSpecMetaData.java index c08237c262e..2a6670dc508 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ServiceAccountReference.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostSpecMetaData.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model; +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; import java.util.LinkedHashMap; import java.util.Map; @@ -52,7 +52,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ServiceAccountReference implements Editable , KubernetesResource +public class BareMetalHostSpecMetaData implements Editable , KubernetesResource { @JsonProperty("name") @@ -66,10 +66,10 @@ public class ServiceAccountReference implements Editable , KubernetesResource +{ + + @JsonProperty("name") + private String name; + @JsonProperty("namespace") + private String namespace; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public BareMetalHostSpecNetworkData() { + } + + public BareMetalHostSpecNetworkData(String name, String namespace) { + super(); + this.name = name; + this.namespace = namespace; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonProperty("namespace") + public String getNamespace() { + return namespace; + } + + @JsonProperty("namespace") + public void setNamespace(String namespace) { + this.namespace = namespace; + } + + @JsonIgnore + public BareMetalHostSpecNetworkDataBuilder edit() { + return new BareMetalHostSpecNetworkDataBuilder(this); + } + + @JsonIgnore + public BareMetalHostSpecNetworkDataBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/RAIDConfig.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostSpecRaid.java similarity index 77% rename from kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/RAIDConfig.java rename to kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostSpecRaid.java index 90780cd959a..de67ae7bc0e 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/RAIDConfig.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostSpecRaid.java @@ -1,9 +1,7 @@ package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; -import java.util.ArrayList; import java.util.LinkedHashMap; -import java.util.List; import java.util.Map; import javax.annotation.Generated; import com.fasterxml.jackson.annotation.JsonAnyGetter; @@ -54,15 +52,15 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class RAIDConfig implements Editable , KubernetesResource +public class BareMetalHostSpecRaid implements Editable , KubernetesResource { @JsonProperty("hardwareRAIDVolumes") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List hardwareRAIDVolumes = new ArrayList<>(); + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + private Object hardwareRAIDVolumes; @JsonProperty("softwareRAIDVolumes") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List softwareRAIDVolumes = new ArrayList<>(); + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + private Object softwareRAIDVolumes; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -70,44 +68,44 @@ public class RAIDConfig implements Editable , KubernetesResou * No args constructor for use in serialization * */ - public RAIDConfig() { + public BareMetalHostSpecRaid() { } - public RAIDConfig(List hardwareRAIDVolumes, List softwareRAIDVolumes) { + public BareMetalHostSpecRaid(Object hardwareRAIDVolumes, Object softwareRAIDVolumes) { super(); this.hardwareRAIDVolumes = hardwareRAIDVolumes; this.softwareRAIDVolumes = softwareRAIDVolumes; } @JsonProperty("hardwareRAIDVolumes") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getHardwareRAIDVolumes() { + public Object getHardwareRAIDVolumes() { return hardwareRAIDVolumes; } @JsonProperty("hardwareRAIDVolumes") - public void setHardwareRAIDVolumes(List hardwareRAIDVolumes) { + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + public void setHardwareRAIDVolumes(Object hardwareRAIDVolumes) { this.hardwareRAIDVolumes = hardwareRAIDVolumes; } @JsonProperty("softwareRAIDVolumes") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getSoftwareRAIDVolumes() { + public Object getSoftwareRAIDVolumes() { return softwareRAIDVolumes; } @JsonProperty("softwareRAIDVolumes") - public void setSoftwareRAIDVolumes(List softwareRAIDVolumes) { + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + public void setSoftwareRAIDVolumes(Object softwareRAIDVolumes) { this.softwareRAIDVolumes = softwareRAIDVolumes; } @JsonIgnore - public RAIDConfigBuilder edit() { - return new RAIDConfigBuilder(this); + public BareMetalHostSpecRaidBuilder edit() { + return new BareMetalHostSpecRaidBuilder(this); } @JsonIgnore - public RAIDConfigBuilder toBuilder() { + public BareMetalHostSpecRaidBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/RootDeviceHints.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostSpecRootDeviceHints.java similarity index 91% rename from kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/RootDeviceHints.java rename to kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostSpecRootDeviceHints.java index fc0bf72c0d2..aa4dc507381 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/RootDeviceHints.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostSpecRootDeviceHints.java @@ -60,7 +60,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class RootDeviceHints implements Editable , KubernetesResource +public class BareMetalHostSpecRootDeviceHints implements Editable , KubernetesResource { @JsonProperty("deviceName") @@ -90,10 +90,10 @@ public class RootDeviceHints implements Editable , Kuber * No args constructor for use in serialization * */ - public RootDeviceHints() { + public BareMetalHostSpecRootDeviceHints() { } - public RootDeviceHints(String deviceName, String hctl, Integer minSizeGigabytes, String model, Boolean rotational, String serialNumber, String vendor, String wwn, String wwnVendorExtension, String wwnWithExtension) { + public BareMetalHostSpecRootDeviceHints(String deviceName, String hctl, Integer minSizeGigabytes, String model, Boolean rotational, String serialNumber, String vendor, String wwn, String wwnVendorExtension, String wwnWithExtension) { super(); this.deviceName = deviceName; this.hctl = hctl; @@ -208,12 +208,12 @@ public void setWwnWithExtension(String wwnWithExtension) { } @JsonIgnore - public RootDeviceHintsBuilder edit() { - return new RootDeviceHintsBuilder(this); + public BareMetalHostSpecRootDeviceHintsBuilder edit() { + return new BareMetalHostSpecRootDeviceHintsBuilder(this); } @JsonIgnore - public RootDeviceHintsBuilder toBuilder() { + public BareMetalHostSpecRootDeviceHintsBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostSpecTaints.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostSpecTaints.java new file mode 100644 index 00000000000..badec87e5b6 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostSpecTaints.java @@ -0,0 +1,150 @@ + +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "effect", + "key", + "timeAdded", + "value" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class BareMetalHostSpecTaints implements Editable , KubernetesResource +{ + + @JsonProperty("effect") + private String effect; + @JsonProperty("key") + private String key; + @JsonProperty("timeAdded") + private String timeAdded; + @JsonProperty("value") + private String value; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public BareMetalHostSpecTaints() { + } + + public BareMetalHostSpecTaints(String effect, String key, String timeAdded, String value) { + super(); + this.effect = effect; + this.key = key; + this.timeAdded = timeAdded; + this.value = value; + } + + @JsonProperty("effect") + public String getEffect() { + return effect; + } + + @JsonProperty("effect") + public void setEffect(String effect) { + this.effect = effect; + } + + @JsonProperty("key") + public String getKey() { + return key; + } + + @JsonProperty("key") + public void setKey(String key) { + this.key = key; + } + + @JsonProperty("timeAdded") + public String getTimeAdded() { + return timeAdded; + } + + @JsonProperty("timeAdded") + public void setTimeAdded(String timeAdded) { + this.timeAdded = timeAdded; + } + + @JsonProperty("value") + public String getValue() { + return value; + } + + @JsonProperty("value") + public void setValue(String value) { + this.value = value; + } + + @JsonIgnore + public BareMetalHostSpecTaintsBuilder edit() { + return new BareMetalHostSpecTaintsBuilder(this); + } + + @JsonIgnore + public BareMetalHostSpecTaintsBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostSpecUserData.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostSpecUserData.java new file mode 100644 index 00000000000..0525ad7a2b5 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostSpecUserData.java @@ -0,0 +1,122 @@ + +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "name", + "namespace" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class BareMetalHostSpecUserData implements Editable , KubernetesResource +{ + + @JsonProperty("name") + private String name; + @JsonProperty("namespace") + private String namespace; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public BareMetalHostSpecUserData() { + } + + public BareMetalHostSpecUserData(String name, String namespace) { + super(); + this.name = name; + this.namespace = namespace; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonProperty("namespace") + public String getNamespace() { + return namespace; + } + + @JsonProperty("namespace") + public void setNamespace(String namespace) { + this.namespace = namespace; + } + + @JsonIgnore + public BareMetalHostSpecUserDataBuilder edit() { + return new BareMetalHostSpecUserDataBuilder(this); + } + + @JsonIgnore + public BareMetalHostSpecUserDataBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatus.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatus.java index 66422439986..94b143900e5 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatus.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatus.java @@ -72,23 +72,23 @@ public class BareMetalHostStatus implements Editable @JsonProperty("errorType") private String errorType; @JsonProperty("goodCredentials") - private CredentialsStatus goodCredentials; + private BareMetalHostStatusGoodCredentials goodCredentials; @JsonProperty("hardware") - private HardwareDetails hardware; + private BareMetalHostStatusHardware hardware; @JsonProperty("hardwareProfile") private String hardwareProfile; @JsonProperty("lastUpdated") private String lastUpdated; @JsonProperty("operationHistory") - private OperationHistory operationHistory; + private BareMetalHostStatusOperationHistory operationHistory; @JsonProperty("operationalStatus") private String operationalStatus; @JsonProperty("poweredOn") private Boolean poweredOn; @JsonProperty("provisioning") - private ProvisionStatus provisioning; + private BareMetalHostStatusProvisioning provisioning; @JsonProperty("triedCredentials") - private CredentialsStatus triedCredentials; + private BareMetalHostStatusTriedCredentials triedCredentials; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -99,7 +99,7 @@ public class BareMetalHostStatus implements Editable public BareMetalHostStatus() { } - public BareMetalHostStatus(Integer errorCount, String errorMessage, String errorType, CredentialsStatus goodCredentials, HardwareDetails hardware, String hardwareProfile, String lastUpdated, OperationHistory operationHistory, String operationalStatus, Boolean poweredOn, ProvisionStatus provisioning, CredentialsStatus triedCredentials) { + public BareMetalHostStatus(Integer errorCount, String errorMessage, String errorType, BareMetalHostStatusGoodCredentials goodCredentials, BareMetalHostStatusHardware hardware, String hardwareProfile, String lastUpdated, BareMetalHostStatusOperationHistory operationHistory, String operationalStatus, Boolean poweredOn, BareMetalHostStatusProvisioning provisioning, BareMetalHostStatusTriedCredentials triedCredentials) { super(); this.errorCount = errorCount; this.errorMessage = errorMessage; @@ -146,22 +146,22 @@ public void setErrorType(String errorType) { } @JsonProperty("goodCredentials") - public CredentialsStatus getGoodCredentials() { + public BareMetalHostStatusGoodCredentials getGoodCredentials() { return goodCredentials; } @JsonProperty("goodCredentials") - public void setGoodCredentials(CredentialsStatus goodCredentials) { + public void setGoodCredentials(BareMetalHostStatusGoodCredentials goodCredentials) { this.goodCredentials = goodCredentials; } @JsonProperty("hardware") - public HardwareDetails getHardware() { + public BareMetalHostStatusHardware getHardware() { return hardware; } @JsonProperty("hardware") - public void setHardware(HardwareDetails hardware) { + public void setHardware(BareMetalHostStatusHardware hardware) { this.hardware = hardware; } @@ -186,12 +186,12 @@ public void setLastUpdated(String lastUpdated) { } @JsonProperty("operationHistory") - public OperationHistory getOperationHistory() { + public BareMetalHostStatusOperationHistory getOperationHistory() { return operationHistory; } @JsonProperty("operationHistory") - public void setOperationHistory(OperationHistory operationHistory) { + public void setOperationHistory(BareMetalHostStatusOperationHistory operationHistory) { this.operationHistory = operationHistory; } @@ -216,22 +216,22 @@ public void setPoweredOn(Boolean poweredOn) { } @JsonProperty("provisioning") - public ProvisionStatus getProvisioning() { + public BareMetalHostStatusProvisioning getProvisioning() { return provisioning; } @JsonProperty("provisioning") - public void setProvisioning(ProvisionStatus provisioning) { + public void setProvisioning(BareMetalHostStatusProvisioning provisioning) { this.provisioning = provisioning; } @JsonProperty("triedCredentials") - public CredentialsStatus getTriedCredentials() { + public BareMetalHostStatusTriedCredentials getTriedCredentials() { return triedCredentials; } @JsonProperty("triedCredentials") - public void setTriedCredentials(CredentialsStatus triedCredentials) { + public void setTriedCredentials(BareMetalHostStatusTriedCredentials triedCredentials) { this.triedCredentials = triedCredentials; } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/CredentialsStatus.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusGoodCredentials.java similarity index 88% rename from kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/CredentialsStatus.java rename to kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusGoodCredentials.java index 55bd53f28de..97807315080 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/CredentialsStatus.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusGoodCredentials.java @@ -53,7 +53,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class CredentialsStatus implements Editable , KubernetesResource +public class BareMetalHostStatusGoodCredentials implements Editable , KubernetesResource { @JsonProperty("credentials") @@ -67,10 +67,10 @@ public class CredentialsStatus implements Editable , K * No args constructor for use in serialization * */ - public CredentialsStatus() { + public BareMetalHostStatusGoodCredentials() { } - public CredentialsStatus(SecretReference credentials, String credentialsVersion) { + public BareMetalHostStatusGoodCredentials(SecretReference credentials, String credentialsVersion) { super(); this.credentials = credentials; this.credentialsVersion = credentialsVersion; @@ -97,12 +97,12 @@ public void setCredentialsVersion(String credentialsVersion) { } @JsonIgnore - public CredentialsStatusBuilder edit() { - return new CredentialsStatusBuilder(this); + public BareMetalHostStatusGoodCredentialsBuilder edit() { + return new BareMetalHostStatusGoodCredentialsBuilder(this); } @JsonIgnore - public CredentialsStatusBuilder toBuilder() { + public BareMetalHostStatusGoodCredentialsBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusHCpu.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusHCpu.java new file mode 100644 index 00000000000..9975407ee5c --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusHCpu.java @@ -0,0 +1,168 @@ + +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "arch", + "clockMegahertz", + "count", + "flags", + "model" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class BareMetalHostStatusHCpu implements Editable , KubernetesResource +{ + + @JsonProperty("arch") + private String arch; + @JsonProperty("clockMegahertz") + private Double clockMegahertz; + @JsonProperty("count") + private Integer count; + @JsonProperty("flags") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List flags = new ArrayList<>(); + @JsonProperty("model") + private String model; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public BareMetalHostStatusHCpu() { + } + + public BareMetalHostStatusHCpu(String arch, Double clockMegahertz, Integer count, List flags, String model) { + super(); + this.arch = arch; + this.clockMegahertz = clockMegahertz; + this.count = count; + this.flags = flags; + this.model = model; + } + + @JsonProperty("arch") + public String getArch() { + return arch; + } + + @JsonProperty("arch") + public void setArch(String arch) { + this.arch = arch; + } + + @JsonProperty("clockMegahertz") + public Double getClockMegahertz() { + return clockMegahertz; + } + + @JsonProperty("clockMegahertz") + public void setClockMegahertz(Double clockMegahertz) { + this.clockMegahertz = clockMegahertz; + } + + @JsonProperty("count") + public Integer getCount() { + return count; + } + + @JsonProperty("count") + public void setCount(Integer count) { + this.count = count; + } + + @JsonProperty("flags") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getFlags() { + return flags; + } + + @JsonProperty("flags") + public void setFlags(List flags) { + this.flags = flags; + } + + @JsonProperty("model") + public String getModel() { + return model; + } + + @JsonProperty("model") + public void setModel(String model) { + this.model = model; + } + + @JsonIgnore + public BareMetalHostStatusHCpuBuilder edit() { + return new BareMetalHostStatusHCpuBuilder(this); + } + + @JsonIgnore + public BareMetalHostStatusHCpuBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusHFBios.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusHFBios.java new file mode 100644 index 00000000000..8985fcc44fa --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusHFBios.java @@ -0,0 +1,136 @@ + +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "date", + "vendor", + "version" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class BareMetalHostStatusHFBios implements Editable , KubernetesResource +{ + + @JsonProperty("date") + private String date; + @JsonProperty("vendor") + private String vendor; + @JsonProperty("version") + private String version; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public BareMetalHostStatusHFBios() { + } + + public BareMetalHostStatusHFBios(String date, String vendor, String version) { + super(); + this.date = date; + this.vendor = vendor; + this.version = version; + } + + @JsonProperty("date") + public String getDate() { + return date; + } + + @JsonProperty("date") + public void setDate(String date) { + this.date = date; + } + + @JsonProperty("vendor") + public String getVendor() { + return vendor; + } + + @JsonProperty("vendor") + public void setVendor(String vendor) { + this.vendor = vendor; + } + + @JsonProperty("version") + public String getVersion() { + return version; + } + + @JsonProperty("version") + public void setVersion(String version) { + this.version = version; + } + + @JsonIgnore + public BareMetalHostStatusHFBiosBuilder edit() { + return new BareMetalHostStatusHFBiosBuilder(this); + } + + @JsonIgnore + public BareMetalHostStatusHFBiosBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryConfigStoragePVC.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusHFirmware.java similarity index 78% rename from kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryConfigStoragePVC.java rename to kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusHFirmware.java index 1f12a05f7cd..7836ab787d3 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryConfigStoragePVC.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusHFirmware.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1; +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; import java.util.LinkedHashMap; import java.util.Map; @@ -31,7 +31,7 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "claim" + "bios" }) @ToString @EqualsAndHashCode @@ -51,11 +51,11 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ImageRegistryConfigStoragePVC implements Editable , KubernetesResource +public class BareMetalHostStatusHFirmware implements Editable , KubernetesResource { - @JsonProperty("claim") - private String claim; + @JsonProperty("bios") + private BareMetalHostStatusHFBios bios; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -63,31 +63,31 @@ public class ImageRegistryConfigStoragePVC implements Editable , KubernetesResource +{ + + @JsonProperty("id") + private Integer id; + @JsonProperty("name") + private String name; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public BareMetalHostStatusHNVlans() { + } + + public BareMetalHostStatusHNVlans(Integer id, String name) { + super(); + this.id = id; + this.name = name; + } + + @JsonProperty("id") + public Integer getId() { + return id; + } + + @JsonProperty("id") + public void setId(Integer id) { + this.id = id; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonIgnore + public BareMetalHostStatusHNVlansBuilder edit() { + return new BareMetalHostStatusHNVlansBuilder(this); + } + + @JsonIgnore + public BareMetalHostStatusHNVlansBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} 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/BareMetalHostStatusHNics.java similarity index 56% rename from kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HardwareRAIDVolume.java rename to kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusHNics.java index f30a0477825..6d29e65d5c3 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/BareMetalHostStatusHNics.java @@ -33,13 +33,14 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "controller", - "level", + "ip", + "mac", + "model", "name", - "numberOfPhysicalDisks", - "physicalDisks", - "rotational", - "sizeGibibytes" + "pxe", + "speedGbps", + "vlanId", + "vlans" }) @ToString @EqualsAndHashCode @@ -59,24 +60,26 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class HardwareRAIDVolume implements Editable , KubernetesResource +public class BareMetalHostStatusHNics implements Editable , KubernetesResource { - @JsonProperty("controller") - private String controller; - @JsonProperty("level") - private String level; + @JsonProperty("ip") + private String ip; + @JsonProperty("mac") + private String mac; + @JsonProperty("model") + private String model; @JsonProperty("name") private String name; - @JsonProperty("numberOfPhysicalDisks") - private Integer numberOfPhysicalDisks; - @JsonProperty("physicalDisks") + @JsonProperty("pxe") + private Boolean pxe; + @JsonProperty("speedGbps") + private Integer speedGbps; + @JsonProperty("vlanId") + private Integer vlanId; + @JsonProperty("vlans") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List physicalDisks = new ArrayList<>(); - @JsonProperty("rotational") - private Boolean rotational; - @JsonProperty("sizeGibibytes") - private Integer sizeGibibytes; + private List vlans = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -84,38 +87,49 @@ public class HardwareRAIDVolume implements Editable , * No args constructor for use in serialization * */ - public HardwareRAIDVolume() { + public BareMetalHostStatusHNics() { } - public HardwareRAIDVolume(String controller, String level, String name, Integer numberOfPhysicalDisks, List physicalDisks, Boolean rotational, Integer sizeGibibytes) { + public BareMetalHostStatusHNics(String ip, String mac, String model, String name, Boolean pxe, Integer speedGbps, Integer vlanId, List vlans) { super(); - this.controller = controller; - this.level = level; + this.ip = ip; + this.mac = mac; + this.model = model; this.name = name; - this.numberOfPhysicalDisks = numberOfPhysicalDisks; - this.physicalDisks = physicalDisks; - this.rotational = rotational; - this.sizeGibibytes = sizeGibibytes; + this.pxe = pxe; + this.speedGbps = speedGbps; + this.vlanId = vlanId; + this.vlans = vlans; } - @JsonProperty("controller") - public String getController() { - return controller; + @JsonProperty("ip") + public String getIp() { + return ip; } - @JsonProperty("controller") - public void setController(String controller) { - this.controller = controller; + @JsonProperty("ip") + public void setIp(String ip) { + this.ip = ip; } - @JsonProperty("level") - public String getLevel() { - return level; + @JsonProperty("mac") + public String getMac() { + return mac; } - @JsonProperty("level") - public void setLevel(String level) { - this.level = level; + @JsonProperty("mac") + public void setMac(String mac) { + this.mac = mac; + } + + @JsonProperty("model") + public String getModel() { + return model; + } + + @JsonProperty("model") + public void setModel(String model) { + this.model = model; } @JsonProperty("name") @@ -128,54 +142,54 @@ public void setName(String name) { this.name = name; } - @JsonProperty("numberOfPhysicalDisks") - public Integer getNumberOfPhysicalDisks() { - return numberOfPhysicalDisks; + @JsonProperty("pxe") + public Boolean getPxe() { + return pxe; } - @JsonProperty("numberOfPhysicalDisks") - public void setNumberOfPhysicalDisks(Integer numberOfPhysicalDisks) { - this.numberOfPhysicalDisks = numberOfPhysicalDisks; + @JsonProperty("pxe") + public void setPxe(Boolean pxe) { + this.pxe = pxe; } - @JsonProperty("physicalDisks") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getPhysicalDisks() { - return physicalDisks; + @JsonProperty("speedGbps") + public Integer getSpeedGbps() { + return speedGbps; } - @JsonProperty("physicalDisks") - public void setPhysicalDisks(List physicalDisks) { - this.physicalDisks = physicalDisks; + @JsonProperty("speedGbps") + public void setSpeedGbps(Integer speedGbps) { + this.speedGbps = speedGbps; } - @JsonProperty("rotational") - public Boolean getRotational() { - return rotational; + @JsonProperty("vlanId") + public Integer getVlanId() { + return vlanId; } - @JsonProperty("rotational") - public void setRotational(Boolean rotational) { - this.rotational = rotational; + @JsonProperty("vlanId") + public void setVlanId(Integer vlanId) { + this.vlanId = vlanId; } - @JsonProperty("sizeGibibytes") - public Integer getSizeGibibytes() { - return sizeGibibytes; + @JsonProperty("vlans") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getVlans() { + return vlans; } - @JsonProperty("sizeGibibytes") - public void setSizeGibibytes(Integer sizeGibibytes) { - this.sizeGibibytes = sizeGibibytes; + @JsonProperty("vlans") + public void setVlans(List vlans) { + this.vlans = vlans; } @JsonIgnore - public HardwareRAIDVolumeBuilder edit() { - return new HardwareRAIDVolumeBuilder(this); + public BareMetalHostStatusHNicsBuilder edit() { + return new BareMetalHostStatusHNicsBuilder(this); } @JsonIgnore - public HardwareRAIDVolumeBuilder toBuilder() { + public BareMetalHostStatusHNicsBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusHStorage.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusHStorage.java new file mode 100644 index 00000000000..275966c3892 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusHStorage.java @@ -0,0 +1,266 @@ + +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "alternateNames", + "hctl", + "model", + "name", + "rotational", + "serialNumber", + "sizeBytes", + "type", + "vendor", + "wwn", + "wwnVendorExtension", + "wwnWithExtension" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class BareMetalHostStatusHStorage implements Editable , KubernetesResource +{ + + @JsonProperty("alternateNames") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List alternateNames = new ArrayList<>(); + @JsonProperty("hctl") + private String hctl; + @JsonProperty("model") + private String model; + @JsonProperty("name") + private String name; + @JsonProperty("rotational") + private Boolean rotational; + @JsonProperty("serialNumber") + private String serialNumber; + @JsonProperty("sizeBytes") + private Long sizeBytes; + @JsonProperty("type") + private String type; + @JsonProperty("vendor") + private String vendor; + @JsonProperty("wwn") + private String wwn; + @JsonProperty("wwnVendorExtension") + private String wwnVendorExtension; + @JsonProperty("wwnWithExtension") + private String wwnWithExtension; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public BareMetalHostStatusHStorage() { + } + + public BareMetalHostStatusHStorage(List alternateNames, String hctl, String model, String name, Boolean rotational, String serialNumber, Long sizeBytes, String type, String vendor, String wwn, String wwnVendorExtension, String wwnWithExtension) { + super(); + this.alternateNames = alternateNames; + this.hctl = hctl; + this.model = model; + this.name = name; + this.rotational = rotational; + this.serialNumber = serialNumber; + this.sizeBytes = sizeBytes; + this.type = type; + this.vendor = vendor; + this.wwn = wwn; + this.wwnVendorExtension = wwnVendorExtension; + this.wwnWithExtension = wwnWithExtension; + } + + @JsonProperty("alternateNames") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getAlternateNames() { + return alternateNames; + } + + @JsonProperty("alternateNames") + public void setAlternateNames(List alternateNames) { + this.alternateNames = alternateNames; + } + + @JsonProperty("hctl") + public String getHctl() { + return hctl; + } + + @JsonProperty("hctl") + public void setHctl(String hctl) { + this.hctl = hctl; + } + + @JsonProperty("model") + public String getModel() { + return model; + } + + @JsonProperty("model") + public void setModel(String model) { + this.model = model; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonProperty("rotational") + public Boolean getRotational() { + return rotational; + } + + @JsonProperty("rotational") + public void setRotational(Boolean rotational) { + this.rotational = rotational; + } + + @JsonProperty("serialNumber") + public String getSerialNumber() { + return serialNumber; + } + + @JsonProperty("serialNumber") + public void setSerialNumber(String serialNumber) { + this.serialNumber = serialNumber; + } + + @JsonProperty("sizeBytes") + public Long getSizeBytes() { + return sizeBytes; + } + + @JsonProperty("sizeBytes") + public void setSizeBytes(Long sizeBytes) { + this.sizeBytes = sizeBytes; + } + + @JsonProperty("type") + public String getType() { + return type; + } + + @JsonProperty("type") + public void setType(String type) { + this.type = type; + } + + @JsonProperty("vendor") + public String getVendor() { + return vendor; + } + + @JsonProperty("vendor") + public void setVendor(String vendor) { + this.vendor = vendor; + } + + @JsonProperty("wwn") + public String getWwn() { + return wwn; + } + + @JsonProperty("wwn") + public void setWwn(String wwn) { + this.wwn = wwn; + } + + @JsonProperty("wwnVendorExtension") + public String getWwnVendorExtension() { + return wwnVendorExtension; + } + + @JsonProperty("wwnVendorExtension") + public void setWwnVendorExtension(String wwnVendorExtension) { + this.wwnVendorExtension = wwnVendorExtension; + } + + @JsonProperty("wwnWithExtension") + public String getWwnWithExtension() { + return wwnWithExtension; + } + + @JsonProperty("wwnWithExtension") + public void setWwnWithExtension(String wwnWithExtension) { + this.wwnWithExtension = wwnWithExtension; + } + + @JsonIgnore + public BareMetalHostStatusHStorageBuilder edit() { + return new BareMetalHostStatusHStorageBuilder(this); + } + + @JsonIgnore + public BareMetalHostStatusHStorageBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusHSystemVendor.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusHSystemVendor.java new file mode 100644 index 00000000000..2268f29c177 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusHSystemVendor.java @@ -0,0 +1,136 @@ + +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "manufacturer", + "productName", + "serialNumber" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class BareMetalHostStatusHSystemVendor implements Editable , KubernetesResource +{ + + @JsonProperty("manufacturer") + private String manufacturer; + @JsonProperty("productName") + private String productName; + @JsonProperty("serialNumber") + private String serialNumber; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public BareMetalHostStatusHSystemVendor() { + } + + public BareMetalHostStatusHSystemVendor(String manufacturer, String productName, String serialNumber) { + super(); + this.manufacturer = manufacturer; + this.productName = productName; + this.serialNumber = serialNumber; + } + + @JsonProperty("manufacturer") + public String getManufacturer() { + return manufacturer; + } + + @JsonProperty("manufacturer") + public void setManufacturer(String manufacturer) { + this.manufacturer = manufacturer; + } + + @JsonProperty("productName") + public String getProductName() { + return productName; + } + + @JsonProperty("productName") + public void setProductName(String productName) { + this.productName = productName; + } + + @JsonProperty("serialNumber") + public String getSerialNumber() { + return serialNumber; + } + + @JsonProperty("serialNumber") + public void setSerialNumber(String serialNumber) { + this.serialNumber = serialNumber; + } + + @JsonIgnore + public BareMetalHostStatusHSystemVendorBuilder edit() { + return new BareMetalHostStatusHSystemVendorBuilder(this); + } + + @JsonIgnore + public BareMetalHostStatusHSystemVendorBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusHardware.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusHardware.java new file mode 100644 index 00000000000..d6028935668 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusHardware.java @@ -0,0 +1,198 @@ + +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "cpu", + "firmware", + "hostname", + "nics", + "ramMebibytes", + "storage", + "systemVendor" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class BareMetalHostStatusHardware implements Editable , KubernetesResource +{ + + @JsonProperty("cpu") + private BareMetalHostStatusHCpu cpu; + @JsonProperty("firmware") + private BareMetalHostStatusHFirmware firmware; + @JsonProperty("hostname") + private String hostname; + @JsonProperty("nics") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List nics = new ArrayList<>(); + @JsonProperty("ramMebibytes") + private Integer ramMebibytes; + @JsonProperty("storage") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List storage = new ArrayList<>(); + @JsonProperty("systemVendor") + private BareMetalHostStatusHSystemVendor systemVendor; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public BareMetalHostStatusHardware() { + } + + public BareMetalHostStatusHardware(BareMetalHostStatusHCpu cpu, BareMetalHostStatusHFirmware firmware, String hostname, List nics, Integer ramMebibytes, List storage, BareMetalHostStatusHSystemVendor systemVendor) { + super(); + this.cpu = cpu; + this.firmware = firmware; + this.hostname = hostname; + this.nics = nics; + this.ramMebibytes = ramMebibytes; + this.storage = storage; + this.systemVendor = systemVendor; + } + + @JsonProperty("cpu") + public BareMetalHostStatusHCpu getCpu() { + return cpu; + } + + @JsonProperty("cpu") + public void setCpu(BareMetalHostStatusHCpu cpu) { + this.cpu = cpu; + } + + @JsonProperty("firmware") + public BareMetalHostStatusHFirmware getFirmware() { + return firmware; + } + + @JsonProperty("firmware") + public void setFirmware(BareMetalHostStatusHFirmware firmware) { + this.firmware = firmware; + } + + @JsonProperty("hostname") + public String getHostname() { + return hostname; + } + + @JsonProperty("hostname") + public void setHostname(String hostname) { + this.hostname = hostname; + } + + @JsonProperty("nics") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getNics() { + return nics; + } + + @JsonProperty("nics") + public void setNics(List nics) { + this.nics = nics; + } + + @JsonProperty("ramMebibytes") + public Integer getRamMebibytes() { + return ramMebibytes; + } + + @JsonProperty("ramMebibytes") + public void setRamMebibytes(Integer ramMebibytes) { + this.ramMebibytes = ramMebibytes; + } + + @JsonProperty("storage") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getStorage() { + return storage; + } + + @JsonProperty("storage") + public void setStorage(List storage) { + this.storage = storage; + } + + @JsonProperty("systemVendor") + public BareMetalHostStatusHSystemVendor getSystemVendor() { + return systemVendor; + } + + @JsonProperty("systemVendor") + public void setSystemVendor(BareMetalHostStatusHSystemVendor systemVendor) { + this.systemVendor = systemVendor; + } + + @JsonIgnore + public BareMetalHostStatusHardwareBuilder edit() { + return new BareMetalHostStatusHardwareBuilder(this); + } + + @JsonIgnore + public BareMetalHostStatusHardwareBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusOHDeprovision.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusOHDeprovision.java new file mode 100644 index 00000000000..9991a070af2 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusOHDeprovision.java @@ -0,0 +1,126 @@ + +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "end", + "start" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class BareMetalHostStatusOHDeprovision implements Editable , KubernetesResource +{ + + @JsonProperty("end") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + private Object end; + @JsonProperty("start") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + private Object start; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public BareMetalHostStatusOHDeprovision() { + } + + public BareMetalHostStatusOHDeprovision(Object end, Object start) { + super(); + this.end = end; + this.start = start; + } + + @JsonProperty("end") + public Object getEnd() { + return end; + } + + @JsonProperty("end") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + public void setEnd(Object end) { + this.end = end; + } + + @JsonProperty("start") + public Object getStart() { + return start; + } + + @JsonProperty("start") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + public void setStart(Object start) { + this.start = start; + } + + @JsonIgnore + public BareMetalHostStatusOHDeprovisionBuilder edit() { + return new BareMetalHostStatusOHDeprovisionBuilder(this); + } + + @JsonIgnore + public BareMetalHostStatusOHDeprovisionBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/OperationMetric.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusOHInspect.java similarity index 77% rename from kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/OperationMetric.java rename to kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusOHInspect.java index d2b742442b2..8a87488dabe 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/OperationMetric.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusOHInspect.java @@ -52,13 +52,15 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class OperationMetric implements Editable , KubernetesResource +public class BareMetalHostStatusOHInspect implements Editable , KubernetesResource { @JsonProperty("end") - private String end; + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + private Object end; @JsonProperty("start") - private String start; + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + private Object start; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -66,42 +68,44 @@ public class OperationMetric implements Editable , Kuber * No args constructor for use in serialization * */ - public OperationMetric() { + public BareMetalHostStatusOHInspect() { } - public OperationMetric(String end, String start) { + public BareMetalHostStatusOHInspect(Object end, Object start) { super(); this.end = end; this.start = start; } @JsonProperty("end") - public String getEnd() { + public Object getEnd() { return end; } @JsonProperty("end") - public void setEnd(String end) { + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + public void setEnd(Object end) { this.end = end; } @JsonProperty("start") - public String getStart() { + public Object getStart() { return start; } @JsonProperty("start") - public void setStart(String start) { + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + public void setStart(Object start) { this.start = start; } @JsonIgnore - public OperationMetricBuilder edit() { - return new OperationMetricBuilder(this); + public BareMetalHostStatusOHInspectBuilder edit() { + return new BareMetalHostStatusOHInspectBuilder(this); } @JsonIgnore - public OperationMetricBuilder toBuilder() { + public BareMetalHostStatusOHInspectBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusOHProvision.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusOHProvision.java new file mode 100644 index 00000000000..97110b8dedf --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusOHProvision.java @@ -0,0 +1,126 @@ + +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "end", + "start" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class BareMetalHostStatusOHProvision implements Editable , KubernetesResource +{ + + @JsonProperty("end") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + private Object end; + @JsonProperty("start") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + private Object start; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public BareMetalHostStatusOHProvision() { + } + + public BareMetalHostStatusOHProvision(Object end, Object start) { + super(); + this.end = end; + this.start = start; + } + + @JsonProperty("end") + public Object getEnd() { + return end; + } + + @JsonProperty("end") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + public void setEnd(Object end) { + this.end = end; + } + + @JsonProperty("start") + public Object getStart() { + return start; + } + + @JsonProperty("start") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + public void setStart(Object start) { + this.start = start; + } + + @JsonIgnore + public BareMetalHostStatusOHProvisionBuilder edit() { + return new BareMetalHostStatusOHProvisionBuilder(this); + } + + @JsonIgnore + public BareMetalHostStatusOHProvisionBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusOHRegister.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusOHRegister.java new file mode 100644 index 00000000000..9fceae36e90 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusOHRegister.java @@ -0,0 +1,126 @@ + +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "end", + "start" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class BareMetalHostStatusOHRegister implements Editable , KubernetesResource +{ + + @JsonProperty("end") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + private Object end; + @JsonProperty("start") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + private Object start; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public BareMetalHostStatusOHRegister() { + } + + public BareMetalHostStatusOHRegister(Object end, Object start) { + super(); + this.end = end; + this.start = start; + } + + @JsonProperty("end") + public Object getEnd() { + return end; + } + + @JsonProperty("end") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + public void setEnd(Object end) { + this.end = end; + } + + @JsonProperty("start") + public Object getStart() { + return start; + } + + @JsonProperty("start") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + public void setStart(Object start) { + this.start = start; + } + + @JsonIgnore + public BareMetalHostStatusOHRegisterBuilder edit() { + return new BareMetalHostStatusOHRegisterBuilder(this); + } + + @JsonIgnore + public BareMetalHostStatusOHRegisterBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/OperationHistory.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusOperationHistory.java similarity index 74% rename from kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/OperationHistory.java rename to kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusOperationHistory.java index 3ec744565cf..063d9c3bc72 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/OperationHistory.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusOperationHistory.java @@ -54,17 +54,17 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class OperationHistory implements Editable , KubernetesResource +public class BareMetalHostStatusOperationHistory implements Editable , KubernetesResource { @JsonProperty("deprovision") - private OperationMetric deprovision; + private BareMetalHostStatusOHDeprovision deprovision; @JsonProperty("inspect") - private OperationMetric inspect; + private BareMetalHostStatusOHInspect inspect; @JsonProperty("provision") - private OperationMetric provision; + private BareMetalHostStatusOHProvision provision; @JsonProperty("register") - private OperationMetric register; + private BareMetalHostStatusOHRegister register; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -72,10 +72,10 @@ public class OperationHistory implements Editable , Kub * No args constructor for use in serialization * */ - public OperationHistory() { + public BareMetalHostStatusOperationHistory() { } - public OperationHistory(OperationMetric deprovision, OperationMetric inspect, OperationMetric provision, OperationMetric register) { + public BareMetalHostStatusOperationHistory(BareMetalHostStatusOHDeprovision deprovision, BareMetalHostStatusOHInspect inspect, BareMetalHostStatusOHProvision provision, BareMetalHostStatusOHRegister register) { super(); this.deprovision = deprovision; this.inspect = inspect; @@ -84,52 +84,52 @@ public OperationHistory(OperationMetric deprovision, OperationMetric inspect, Op } @JsonProperty("deprovision") - public OperationMetric getDeprovision() { + public BareMetalHostStatusOHDeprovision getDeprovision() { return deprovision; } @JsonProperty("deprovision") - public void setDeprovision(OperationMetric deprovision) { + public void setDeprovision(BareMetalHostStatusOHDeprovision deprovision) { this.deprovision = deprovision; } @JsonProperty("inspect") - public OperationMetric getInspect() { + public BareMetalHostStatusOHInspect getInspect() { return inspect; } @JsonProperty("inspect") - public void setInspect(OperationMetric inspect) { + public void setInspect(BareMetalHostStatusOHInspect inspect) { this.inspect = inspect; } @JsonProperty("provision") - public OperationMetric getProvision() { + public BareMetalHostStatusOHProvision getProvision() { return provision; } @JsonProperty("provision") - public void setProvision(OperationMetric provision) { + public void setProvision(BareMetalHostStatusOHProvision provision) { this.provision = provision; } @JsonProperty("register") - public OperationMetric getRegister() { + public BareMetalHostStatusOHRegister getRegister() { return register; } @JsonProperty("register") - public void setRegister(OperationMetric register) { + public void setRegister(BareMetalHostStatusOHRegister register) { this.register = register; } @JsonIgnore - public OperationHistoryBuilder edit() { - return new OperationHistoryBuilder(this); + public BareMetalHostStatusOperationHistoryBuilder edit() { + return new BareMetalHostStatusOperationHistoryBuilder(this); } @JsonIgnore - public OperationHistoryBuilder toBuilder() { + public BareMetalHostStatusOperationHistoryBuilder toBuilder() { return edit(); } 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/metal3/v1alpha1/BareMetalHostStatusPCustomDeploy.java similarity index 81% rename from kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/EncryptionAlibaba.java rename to kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusPCustomDeploy.java index b2fd5e7d7cd..3d56fff69f2 100644 --- 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/metal3/v1alpha1/BareMetalHostStatusPCustomDeploy.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1; +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; import java.util.LinkedHashMap; import java.util.Map; @@ -31,7 +31,6 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "kms", "method" }) @ToString @@ -52,11 +51,9 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class EncryptionAlibaba implements Editable , KubernetesResource +public class BareMetalHostStatusPCustomDeploy implements Editable , KubernetesResource { - @JsonProperty("kms") - private KMSEncryptionAlibaba kms; @JsonProperty("method") private String method; @JsonIgnore @@ -66,25 +63,14 @@ public class EncryptionAlibaba implements Editable , K * No args constructor for use in serialization * */ - public EncryptionAlibaba() { + public BareMetalHostStatusPCustomDeploy() { } - public EncryptionAlibaba(KMSEncryptionAlibaba kms, String method) { + public BareMetalHostStatusPCustomDeploy(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; @@ -96,12 +82,12 @@ public void setMethod(String method) { } @JsonIgnore - public EncryptionAlibabaBuilder edit() { - return new EncryptionAlibabaBuilder(this); + public BareMetalHostStatusPCustomDeployBuilder edit() { + return new BareMetalHostStatusPCustomDeployBuilder(this); } @JsonIgnore - public EncryptionAlibabaBuilder toBuilder() { + public BareMetalHostStatusPCustomDeployBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusPFirmware.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusPFirmware.java new file mode 100644 index 00000000000..1638f3fa576 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusPFirmware.java @@ -0,0 +1,136 @@ + +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "simultaneousMultithreadingEnabled", + "sriovEnabled", + "virtualizationEnabled" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class BareMetalHostStatusPFirmware implements Editable , KubernetesResource +{ + + @JsonProperty("simultaneousMultithreadingEnabled") + private Boolean simultaneousMultithreadingEnabled; + @JsonProperty("sriovEnabled") + private Boolean sriovEnabled; + @JsonProperty("virtualizationEnabled") + private Boolean virtualizationEnabled; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public BareMetalHostStatusPFirmware() { + } + + public BareMetalHostStatusPFirmware(Boolean simultaneousMultithreadingEnabled, Boolean sriovEnabled, Boolean virtualizationEnabled) { + super(); + this.simultaneousMultithreadingEnabled = simultaneousMultithreadingEnabled; + this.sriovEnabled = sriovEnabled; + this.virtualizationEnabled = virtualizationEnabled; + } + + @JsonProperty("simultaneousMultithreadingEnabled") + public Boolean getSimultaneousMultithreadingEnabled() { + return simultaneousMultithreadingEnabled; + } + + @JsonProperty("simultaneousMultithreadingEnabled") + public void setSimultaneousMultithreadingEnabled(Boolean simultaneousMultithreadingEnabled) { + this.simultaneousMultithreadingEnabled = simultaneousMultithreadingEnabled; + } + + @JsonProperty("sriovEnabled") + public Boolean getSriovEnabled() { + return sriovEnabled; + } + + @JsonProperty("sriovEnabled") + public void setSriovEnabled(Boolean sriovEnabled) { + this.sriovEnabled = sriovEnabled; + } + + @JsonProperty("virtualizationEnabled") + public Boolean getVirtualizationEnabled() { + return virtualizationEnabled; + } + + @JsonProperty("virtualizationEnabled") + public void setVirtualizationEnabled(Boolean virtualizationEnabled) { + this.virtualizationEnabled = virtualizationEnabled; + } + + @JsonIgnore + public BareMetalHostStatusPFirmwareBuilder edit() { + return new BareMetalHostStatusPFirmwareBuilder(this); + } + + @JsonIgnore + public BareMetalHostStatusPFirmwareBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusPImage.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusPImage.java new file mode 100644 index 00000000000..aa0f613da36 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusPImage.java @@ -0,0 +1,150 @@ + +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "checksum", + "checksumType", + "format", + "url" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class BareMetalHostStatusPImage implements Editable , KubernetesResource +{ + + @JsonProperty("checksum") + private String checksum; + @JsonProperty("checksumType") + private String checksumType; + @JsonProperty("format") + private String format; + @JsonProperty("url") + private String url; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public BareMetalHostStatusPImage() { + } + + public BareMetalHostStatusPImage(String checksum, String checksumType, String format, String url) { + super(); + this.checksum = checksum; + this.checksumType = checksumType; + this.format = format; + this.url = url; + } + + @JsonProperty("checksum") + public String getChecksum() { + return checksum; + } + + @JsonProperty("checksum") + public void setChecksum(String checksum) { + this.checksum = checksum; + } + + @JsonProperty("checksumType") + public String getChecksumType() { + return checksumType; + } + + @JsonProperty("checksumType") + public void setChecksumType(String checksumType) { + this.checksumType = checksumType; + } + + @JsonProperty("format") + public String getFormat() { + return format; + } + + @JsonProperty("format") + public void setFormat(String format) { + this.format = format; + } + + @JsonProperty("url") + public String getUrl() { + return url; + } + + @JsonProperty("url") + public void setUrl(String url) { + this.url = url; + } + + @JsonIgnore + public BareMetalHostStatusPImageBuilder edit() { + return new BareMetalHostStatusPImageBuilder(this); + } + + @JsonIgnore + public BareMetalHostStatusPImageBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusPRaid.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusPRaid.java new file mode 100644 index 00000000000..a1ee4fba9d2 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusPRaid.java @@ -0,0 +1,126 @@ + +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "hardwareRAIDVolumes", + "softwareRAIDVolumes" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class BareMetalHostStatusPRaid implements Editable , KubernetesResource +{ + + @JsonProperty("hardwareRAIDVolumes") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + private Object hardwareRAIDVolumes; + @JsonProperty("softwareRAIDVolumes") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + private Object softwareRAIDVolumes; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public BareMetalHostStatusPRaid() { + } + + public BareMetalHostStatusPRaid(Object hardwareRAIDVolumes, Object softwareRAIDVolumes) { + super(); + this.hardwareRAIDVolumes = hardwareRAIDVolumes; + this.softwareRAIDVolumes = softwareRAIDVolumes; + } + + @JsonProperty("hardwareRAIDVolumes") + public Object getHardwareRAIDVolumes() { + return hardwareRAIDVolumes; + } + + @JsonProperty("hardwareRAIDVolumes") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + public void setHardwareRAIDVolumes(Object hardwareRAIDVolumes) { + this.hardwareRAIDVolumes = hardwareRAIDVolumes; + } + + @JsonProperty("softwareRAIDVolumes") + public Object getSoftwareRAIDVolumes() { + return softwareRAIDVolumes; + } + + @JsonProperty("softwareRAIDVolumes") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + public void setSoftwareRAIDVolumes(Object softwareRAIDVolumes) { + this.softwareRAIDVolumes = softwareRAIDVolumes; + } + + @JsonIgnore + public BareMetalHostStatusPRaidBuilder edit() { + return new BareMetalHostStatusPRaidBuilder(this); + } + + @JsonIgnore + public BareMetalHostStatusPRaidBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusPRootDeviceHints.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusPRootDeviceHints.java new file mode 100644 index 00000000000..0f7c57c12c8 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusPRootDeviceHints.java @@ -0,0 +1,234 @@ + +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "deviceName", + "hctl", + "minSizeGigabytes", + "model", + "rotational", + "serialNumber", + "vendor", + "wwn", + "wwnVendorExtension", + "wwnWithExtension" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class BareMetalHostStatusPRootDeviceHints implements Editable , KubernetesResource +{ + + @JsonProperty("deviceName") + private String deviceName; + @JsonProperty("hctl") + private String hctl; + @JsonProperty("minSizeGigabytes") + private Integer minSizeGigabytes; + @JsonProperty("model") + private String model; + @JsonProperty("rotational") + private Boolean rotational; + @JsonProperty("serialNumber") + private String serialNumber; + @JsonProperty("vendor") + private String vendor; + @JsonProperty("wwn") + private String wwn; + @JsonProperty("wwnVendorExtension") + private String wwnVendorExtension; + @JsonProperty("wwnWithExtension") + private String wwnWithExtension; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public BareMetalHostStatusPRootDeviceHints() { + } + + public BareMetalHostStatusPRootDeviceHints(String deviceName, String hctl, Integer minSizeGigabytes, String model, Boolean rotational, String serialNumber, String vendor, String wwn, String wwnVendorExtension, String wwnWithExtension) { + super(); + this.deviceName = deviceName; + this.hctl = hctl; + this.minSizeGigabytes = minSizeGigabytes; + this.model = model; + this.rotational = rotational; + this.serialNumber = serialNumber; + this.vendor = vendor; + this.wwn = wwn; + this.wwnVendorExtension = wwnVendorExtension; + this.wwnWithExtension = wwnWithExtension; + } + + @JsonProperty("deviceName") + public String getDeviceName() { + return deviceName; + } + + @JsonProperty("deviceName") + public void setDeviceName(String deviceName) { + this.deviceName = deviceName; + } + + @JsonProperty("hctl") + public String getHctl() { + return hctl; + } + + @JsonProperty("hctl") + public void setHctl(String hctl) { + this.hctl = hctl; + } + + @JsonProperty("minSizeGigabytes") + public Integer getMinSizeGigabytes() { + return minSizeGigabytes; + } + + @JsonProperty("minSizeGigabytes") + public void setMinSizeGigabytes(Integer minSizeGigabytes) { + this.minSizeGigabytes = minSizeGigabytes; + } + + @JsonProperty("model") + public String getModel() { + return model; + } + + @JsonProperty("model") + public void setModel(String model) { + this.model = model; + } + + @JsonProperty("rotational") + public Boolean getRotational() { + return rotational; + } + + @JsonProperty("rotational") + public void setRotational(Boolean rotational) { + this.rotational = rotational; + } + + @JsonProperty("serialNumber") + public String getSerialNumber() { + return serialNumber; + } + + @JsonProperty("serialNumber") + public void setSerialNumber(String serialNumber) { + this.serialNumber = serialNumber; + } + + @JsonProperty("vendor") + public String getVendor() { + return vendor; + } + + @JsonProperty("vendor") + public void setVendor(String vendor) { + this.vendor = vendor; + } + + @JsonProperty("wwn") + public String getWwn() { + return wwn; + } + + @JsonProperty("wwn") + public void setWwn(String wwn) { + this.wwn = wwn; + } + + @JsonProperty("wwnVendorExtension") + public String getWwnVendorExtension() { + return wwnVendorExtension; + } + + @JsonProperty("wwnVendorExtension") + public void setWwnVendorExtension(String wwnVendorExtension) { + this.wwnVendorExtension = wwnVendorExtension; + } + + @JsonProperty("wwnWithExtension") + public String getWwnWithExtension() { + return wwnWithExtension; + } + + @JsonProperty("wwnWithExtension") + public void setWwnWithExtension(String wwnWithExtension) { + this.wwnWithExtension = wwnWithExtension; + } + + @JsonIgnore + public BareMetalHostStatusPRootDeviceHintsBuilder edit() { + return new BareMetalHostStatusPRootDeviceHintsBuilder(this); + } + + @JsonIgnore + public BareMetalHostStatusPRootDeviceHintsBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/ProvisionStatus.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusProvisioning.java similarity index 73% rename from kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/ProvisionStatus.java rename to kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusProvisioning.java index e8722bf7427..a958c4cefa6 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/ProvisionStatus.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusProvisioning.java @@ -58,23 +58,23 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ProvisionStatus implements Editable , KubernetesResource +public class BareMetalHostStatusProvisioning implements Editable , KubernetesResource { @JsonProperty("ID") - private String id; + private String iD; @JsonProperty("bootMode") private String bootMode; @JsonProperty("customDeploy") - private CustomDeploy customDeploy; + private BareMetalHostStatusPCustomDeploy customDeploy; @JsonProperty("firmware") - private FirmwareConfig firmware; + private BareMetalHostStatusPFirmware firmware; @JsonProperty("image") - private Image image; + private BareMetalHostStatusPImage image; @JsonProperty("raid") - private RAIDConfig raid; + private BareMetalHostStatusPRaid raid; @JsonProperty("rootDeviceHints") - private RootDeviceHints rootDeviceHints; + private BareMetalHostStatusPRootDeviceHints rootDeviceHints; @JsonProperty("state") private String state; @JsonIgnore @@ -84,12 +84,12 @@ public class ProvisionStatus implements Editable , Kuber * No args constructor for use in serialization * */ - public ProvisionStatus() { + public BareMetalHostStatusProvisioning() { } - public ProvisionStatus(String id, String bootMode, CustomDeploy customDeploy, FirmwareConfig firmware, Image image, RAIDConfig raid, RootDeviceHints rootDeviceHints, String state) { + public BareMetalHostStatusProvisioning(String iD, String bootMode, BareMetalHostStatusPCustomDeploy customDeploy, BareMetalHostStatusPFirmware firmware, BareMetalHostStatusPImage image, BareMetalHostStatusPRaid raid, BareMetalHostStatusPRootDeviceHints rootDeviceHints, String state) { super(); - this.id = id; + this.iD = iD; this.bootMode = bootMode; this.customDeploy = customDeploy; this.firmware = firmware; @@ -100,13 +100,13 @@ public ProvisionStatus(String id, String bootMode, CustomDeploy customDeploy, Fi } @JsonProperty("ID") - public String getId() { - return id; + public String getID() { + return iD; } @JsonProperty("ID") - public void setId(String id) { - this.id = id; + public void setID(String iD) { + this.iD = iD; } @JsonProperty("bootMode") @@ -120,52 +120,52 @@ public void setBootMode(String bootMode) { } @JsonProperty("customDeploy") - public CustomDeploy getCustomDeploy() { + public BareMetalHostStatusPCustomDeploy getCustomDeploy() { return customDeploy; } @JsonProperty("customDeploy") - public void setCustomDeploy(CustomDeploy customDeploy) { + public void setCustomDeploy(BareMetalHostStatusPCustomDeploy customDeploy) { this.customDeploy = customDeploy; } @JsonProperty("firmware") - public FirmwareConfig getFirmware() { + public BareMetalHostStatusPFirmware getFirmware() { return firmware; } @JsonProperty("firmware") - public void setFirmware(FirmwareConfig firmware) { + public void setFirmware(BareMetalHostStatusPFirmware firmware) { this.firmware = firmware; } @JsonProperty("image") - public Image getImage() { + public BareMetalHostStatusPImage getImage() { return image; } @JsonProperty("image") - public void setImage(Image image) { + public void setImage(BareMetalHostStatusPImage image) { this.image = image; } @JsonProperty("raid") - public RAIDConfig getRaid() { + public BareMetalHostStatusPRaid getRaid() { return raid; } @JsonProperty("raid") - public void setRaid(RAIDConfig raid) { + public void setRaid(BareMetalHostStatusPRaid raid) { this.raid = raid; } @JsonProperty("rootDeviceHints") - public RootDeviceHints getRootDeviceHints() { + public BareMetalHostStatusPRootDeviceHints getRootDeviceHints() { return rootDeviceHints; } @JsonProperty("rootDeviceHints") - public void setRootDeviceHints(RootDeviceHints rootDeviceHints) { + public void setRootDeviceHints(BareMetalHostStatusPRootDeviceHints rootDeviceHints) { this.rootDeviceHints = rootDeviceHints; } @@ -180,12 +180,12 @@ public void setState(String state) { } @JsonIgnore - public ProvisionStatusBuilder edit() { - return new ProvisionStatusBuilder(this); + public BareMetalHostStatusProvisioningBuilder edit() { + return new BareMetalHostStatusProvisioningBuilder(this); } @JsonIgnore - public ProvisionStatusBuilder toBuilder() { + public BareMetalHostStatusProvisioningBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusTriedCredentials.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusTriedCredentials.java new file mode 100644 index 00000000000..754be20b505 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatusTriedCredentials.java @@ -0,0 +1,123 @@ + +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +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.builder.Editable; +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.SecretReference; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "credentials", + "credentialsVersion" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class BareMetalHostStatusTriedCredentials implements Editable , KubernetesResource +{ + + @JsonProperty("credentials") + private SecretReference credentials; + @JsonProperty("credentialsVersion") + private String credentialsVersion; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public BareMetalHostStatusTriedCredentials() { + } + + public BareMetalHostStatusTriedCredentials(SecretReference credentials, String credentialsVersion) { + super(); + this.credentials = credentials; + this.credentialsVersion = credentialsVersion; + } + + @JsonProperty("credentials") + public SecretReference getCredentials() { + return credentials; + } + + @JsonProperty("credentials") + public void setCredentials(SecretReference credentials) { + this.credentials = credentials; + } + + @JsonProperty("credentialsVersion") + public String getCredentialsVersion() { + return credentialsVersion; + } + + @JsonProperty("credentialsVersion") + public void setCredentialsVersion(String credentialsVersion) { + this.credentialsVersion = credentialsVersion; + } + + @JsonIgnore + public BareMetalHostStatusTriedCredentialsBuilder edit() { + return new BareMetalHostStatusTriedCredentialsBuilder(this); + } + + @JsonIgnore + public BareMetalHostStatusTriedCredentialsBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/OperatorPKI.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/DataImage.java similarity index 79% rename from kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/OperatorPKI.java rename to kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/DataImage.java index 695a3032dac..4ad1a6d2d01 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/OperatorPKI.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/DataImage.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.miscellaneous.network.operator.v1; +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; import java.util.LinkedHashMap; import java.util.Map; @@ -18,6 +18,7 @@ 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.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -48,7 +49,7 @@ "" }) @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(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @@ -61,10 +62,10 @@ @TemplateTransformations({ @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) }) -@Version("v1") -@Group("network.operator.openshift.io") +@Version("v1alpha1") +@Group("metal3.io") @Generated("jsonschema2pojo") -public class OperatorPKI implements Editable , HasMetadata, Namespaced +public class DataImage implements Editable , HasMetadata, Namespaced { /** @@ -73,20 +74,20 @@ public class OperatorPKI implements Editable , HasMetadata, * */ @JsonProperty("apiVersion") - private String apiVersion = "network.operator.openshift.io/v1"; + private String apiVersion = "metal3.io/v1alpha1"; /** * * (Required) * */ @JsonProperty("kind") - private String kind = "OperatorPKI"; + private String kind = "DataImage"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("spec") - private OperatorPKISpec spec; + private DataImageSpec spec; @JsonProperty("status") - private OperatorPKIStatus status; + private DataImageStatus status; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -94,10 +95,10 @@ public class OperatorPKI implements Editable , HasMetadata, * No args constructor for use in serialization * */ - public OperatorPKI() { + public DataImage() { } - public OperatorPKI(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, OperatorPKISpec spec, OperatorPKIStatus status) { + public DataImage(String apiVersion, String kind, ObjectMeta metadata, DataImageSpec spec, DataImageStatus status) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -147,42 +148,42 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } @JsonProperty("spec") - public OperatorPKISpec getSpec() { + public DataImageSpec getSpec() { return spec; } @JsonProperty("spec") - public void setSpec(OperatorPKISpec spec) { + public void setSpec(DataImageSpec spec) { this.spec = spec; } @JsonProperty("status") - public OperatorPKIStatus getStatus() { + public DataImageStatus getStatus() { return status; } @JsonProperty("status") - public void setStatus(OperatorPKIStatus status) { + public void setStatus(DataImageStatus status) { this.status = status; } @JsonIgnore - public OperatorPKIBuilder edit() { - return new OperatorPKIBuilder(this); + public DataImageBuilder edit() { + return new DataImageBuilder(this); } @JsonIgnore - public OperatorPKIBuilder toBuilder() { + public DataImageBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ConfigList.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/DataImageList.java similarity index 82% rename from kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ConfigList.java rename to kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/DataImageList.java index 44ede39c41d..f0551290d5f 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ConfigList.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/DataImageList.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1; +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -64,10 +64,10 @@ @TemplateTransformations({ @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) }) -@Version("v1") -@Group("imageregistry.operator.openshift.io") +@Version("v1alpha1") +@Group("metal3.io") @Generated("jsonschema2pojo") -public class ConfigList implements Editable , KubernetesResource, KubernetesResourceList +public class DataImageList implements Editable , KubernetesResource, KubernetesResourceList { /** @@ -76,17 +76,17 @@ public class ConfigList implements Editable , KubernetesResou * */ @JsonProperty("apiVersion") - private String apiVersion = "imageregistry.operator.openshift.io/v1"; + private String apiVersion = "metal3.io/v1alpha1"; @JsonProperty("items") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List items = new ArrayList<>(); + private List items = new ArrayList<>(); /** * * (Required) * */ @JsonProperty("kind") - private String kind = "ConfigList"; + private String kind = "DataImageList"; @JsonProperty("metadata") private ListMeta metadata; @JsonIgnore @@ -96,10 +96,10 @@ public class ConfigList implements Editable , KubernetesResou * No args constructor for use in serialization * */ - public ConfigList() { + public DataImageList() { } - public ConfigList(String apiVersion, List items, String kind, ListMeta metadata) { + public DataImageList(String apiVersion, List items, String kind, ListMeta metadata) { super(); this.apiVersion = apiVersion; this.items = items; @@ -129,12 +129,12 @@ public void setApiVersion(String apiVersion) { @JsonProperty("items") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getItems() { + public List getItems() { return items; } @JsonProperty("items") - public void setItems(List items) { + public void setItems(List items) { this.items = items; } @@ -169,12 +169,12 @@ public void setMetadata(ListMeta metadata) { } @JsonIgnore - public ConfigListBuilder edit() { - return new ConfigListBuilder(this); + public DataImageListBuilder edit() { + return new DataImageListBuilder(this); } @JsonIgnore - public ConfigListBuilder toBuilder() { + public DataImageListBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/CertSpec.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/DataImageSpec.java similarity index 81% rename from kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/CertSpec.java rename to kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/DataImageSpec.java index 32e4b985b33..809b50c0621 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/CertSpec.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/DataImageSpec.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.miscellaneous.network.operator.v1; +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; import java.util.LinkedHashMap; import java.util.Map; @@ -31,7 +31,7 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "commonName" + "url" }) @ToString @EqualsAndHashCode @@ -51,11 +51,11 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class CertSpec implements Editable , KubernetesResource +public class DataImageSpec implements Editable , KubernetesResource { - @JsonProperty("commonName") - private String commonName; + @JsonProperty("url") + private String url; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -63,31 +63,31 @@ public class CertSpec implements Editable , KubernetesResource * No args constructor for use in serialization * */ - public CertSpec() { + public DataImageSpec() { } - public CertSpec(String commonName) { + public DataImageSpec(String url) { super(); - this.commonName = commonName; + this.url = url; } - @JsonProperty("commonName") - public String getCommonName() { - return commonName; + @JsonProperty("url") + public String getUrl() { + return url; } - @JsonProperty("commonName") - public void setCommonName(String commonName) { - this.commonName = commonName; + @JsonProperty("url") + public void setUrl(String url) { + this.url = url; } @JsonIgnore - public CertSpecBuilder edit() { - return new CertSpecBuilder(this); + public DataImageSpecBuilder edit() { + return new DataImageSpecBuilder(this); } @JsonIgnore - public CertSpecBuilder toBuilder() { + public DataImageSpecBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/DataImageStatus.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/DataImageStatus.java new file mode 100644 index 00000000000..87537cacf93 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/DataImageStatus.java @@ -0,0 +1,136 @@ + +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "attachedImage", + "error", + "lastReconciled" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class DataImageStatus implements Editable , KubernetesResource +{ + + @JsonProperty("attachedImage") + private DataImageStatusAttachedImage attachedImage; + @JsonProperty("error") + private DataImageStatusError error; + @JsonProperty("lastReconciled") + private String lastReconciled; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public DataImageStatus() { + } + + public DataImageStatus(DataImageStatusAttachedImage attachedImage, DataImageStatusError error, String lastReconciled) { + super(); + this.attachedImage = attachedImage; + this.error = error; + this.lastReconciled = lastReconciled; + } + + @JsonProperty("attachedImage") + public DataImageStatusAttachedImage getAttachedImage() { + return attachedImage; + } + + @JsonProperty("attachedImage") + public void setAttachedImage(DataImageStatusAttachedImage attachedImage) { + this.attachedImage = attachedImage; + } + + @JsonProperty("error") + public DataImageStatusError getError() { + return error; + } + + @JsonProperty("error") + public void setError(DataImageStatusError error) { + this.error = error; + } + + @JsonProperty("lastReconciled") + public String getLastReconciled() { + return lastReconciled; + } + + @JsonProperty("lastReconciled") + public void setLastReconciled(String lastReconciled) { + this.lastReconciled = lastReconciled; + } + + @JsonIgnore + public DataImageStatusBuilder edit() { + return new DataImageStatusBuilder(this); + } + + @JsonIgnore + public DataImageStatusBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/DataImageStatusAttachedImage.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/DataImageStatusAttachedImage.java new file mode 100644 index 00000000000..21ef2d7e4a3 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/DataImageStatusAttachedImage.java @@ -0,0 +1,108 @@ + +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "url" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class DataImageStatusAttachedImage implements Editable , KubernetesResource +{ + + @JsonProperty("url") + private String url; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public DataImageStatusAttachedImage() { + } + + public DataImageStatusAttachedImage(String url) { + super(); + this.url = url; + } + + @JsonProperty("url") + public String getUrl() { + return url; + } + + @JsonProperty("url") + public void setUrl(String url) { + this.url = url; + } + + @JsonIgnore + public DataImageStatusAttachedImageBuilder edit() { + return new DataImageStatusAttachedImageBuilder(this); + } + + @JsonIgnore + public DataImageStatusAttachedImageBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/DataImageStatusError.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/DataImageStatusError.java new file mode 100644 index 00000000000..334b9186f3f --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/DataImageStatusError.java @@ -0,0 +1,122 @@ + +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "count", + "message" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class DataImageStatusError implements Editable , KubernetesResource +{ + + @JsonProperty("count") + private Integer count; + @JsonProperty("message") + private String message; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public DataImageStatusError() { + } + + public DataImageStatusError(Integer count, String message) { + super(); + this.count = count; + this.message = message; + } + + @JsonProperty("count") + public Integer getCount() { + return count; + } + + @JsonProperty("count") + public void setCount(Integer count) { + this.count = count; + } + + @JsonProperty("message") + public String getMessage() { + return message; + } + + @JsonProperty("message") + public void setMessage(String message) { + this.message = message; + } + + @JsonIgnore + public DataImageStatusErrorBuilder edit() { + return new DataImageStatusErrorBuilder(this); + } + + @JsonIgnore + public DataImageStatusErrorBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/EgressNetworkPolicy.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/FirmwareSchema.java similarity index 80% rename from kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/EgressNetworkPolicy.java rename to kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/FirmwareSchema.java index c2f98163935..2a62558e8ff 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/EgressNetworkPolicy.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/FirmwareSchema.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model; +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; import java.util.LinkedHashMap; import java.util.Map; @@ -18,6 +18,7 @@ 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.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -47,7 +48,7 @@ "" }) @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(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @@ -60,10 +61,10 @@ @TemplateTransformations({ @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) }) -@Version("v1") -@Group("network.openshift.io") +@Version("v1alpha1") +@Group("metal3.io") @Generated("jsonschema2pojo") -public class EgressNetworkPolicy implements Editable , HasMetadata, Namespaced +public class FirmwareSchema implements Editable , HasMetadata, Namespaced { /** @@ -72,18 +73,18 @@ public class EgressNetworkPolicy implements Editable * */ @JsonProperty("apiVersion") - private String apiVersion = "network.openshift.io/v1"; + private String apiVersion = "metal3.io/v1alpha1"; /** * * (Required) * */ @JsonProperty("kind") - private String kind = "EgressNetworkPolicy"; + private String kind = "FirmwareSchema"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("spec") - private EgressNetworkPolicySpec spec; + private FirmwareSchemaSpec spec; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -91,10 +92,10 @@ public class EgressNetworkPolicy implements Editable * No args constructor for use in serialization * */ - public EgressNetworkPolicy() { + public FirmwareSchema() { } - public EgressNetworkPolicy(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, EgressNetworkPolicySpec spec) { + public FirmwareSchema(String apiVersion, String kind, ObjectMeta metadata, FirmwareSchemaSpec spec) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -143,32 +144,32 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } @JsonProperty("spec") - public EgressNetworkPolicySpec getSpec() { + public FirmwareSchemaSpec getSpec() { return spec; } @JsonProperty("spec") - public void setSpec(EgressNetworkPolicySpec spec) { + public void setSpec(FirmwareSchemaSpec spec) { this.spec = spec; } @JsonIgnore - public EgressNetworkPolicyBuilder edit() { - return new EgressNetworkPolicyBuilder(this); + public FirmwareSchemaBuilder edit() { + return new FirmwareSchemaBuilder(this); } @JsonIgnore - public EgressNetworkPolicyBuilder toBuilder() { + public FirmwareSchemaBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterNetworkList.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/FirmwareSchemaList.java similarity index 81% rename from kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterNetworkList.java rename to kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/FirmwareSchemaList.java index 7f4d6792ac8..094efa7a98a 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterNetworkList.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/FirmwareSchemaList.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model; +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -64,10 +64,10 @@ @TemplateTransformations({ @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) }) -@Version("v1") -@Group("network.openshift.io") +@Version("v1alpha1") +@Group("metal3.io") @Generated("jsonschema2pojo") -public class ClusterNetworkList implements Editable , KubernetesResource, KubernetesResourceList +public class FirmwareSchemaList implements Editable , KubernetesResource, KubernetesResourceList { /** @@ -76,17 +76,17 @@ public class ClusterNetworkList implements Editable , * */ @JsonProperty("apiVersion") - private String apiVersion = "network.openshift.io/v1"; + private String apiVersion = "metal3.io/v1alpha1"; @JsonProperty("items") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List items = new ArrayList<>(); + private List items = new ArrayList<>(); /** * * (Required) * */ @JsonProperty("kind") - private String kind = "ClusterNetworkList"; + private String kind = "FirmwareSchemaList"; @JsonProperty("metadata") private ListMeta metadata; @JsonIgnore @@ -96,10 +96,10 @@ public class ClusterNetworkList implements Editable , * No args constructor for use in serialization * */ - public ClusterNetworkList() { + public FirmwareSchemaList() { } - public ClusterNetworkList(String apiVersion, List items, String kind, ListMeta metadata) { + public FirmwareSchemaList(String apiVersion, List items, String kind, ListMeta metadata) { super(); this.apiVersion = apiVersion; this.items = items; @@ -129,12 +129,12 @@ public void setApiVersion(String apiVersion) { @JsonProperty("items") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getItems() { + public List getItems() { return items; } @JsonProperty("items") - public void setItems(List items) { + public void setItems(List items) { this.items = items; } @@ -169,12 +169,12 @@ public void setMetadata(ListMeta metadata) { } @JsonIgnore - public ClusterNetworkListBuilder edit() { - return new ClusterNetworkListBuilder(this); + public FirmwareSchemaListBuilder edit() { + return new FirmwareSchemaListBuilder(this); } @JsonIgnore - public ClusterNetworkListBuilder toBuilder() { + public FirmwareSchemaListBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/FirmwareSchemaSpec.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/FirmwareSchemaSpec.java new file mode 100644 index 00000000000..41384243aa5 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/FirmwareSchemaSpec.java @@ -0,0 +1,138 @@ + +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "hardwareModel", + "hardwareVendor", + "schema" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class FirmwareSchemaSpec implements Editable , KubernetesResource +{ + + @JsonProperty("hardwareModel") + private String hardwareModel; + @JsonProperty("hardwareVendor") + private String hardwareVendor; + @JsonProperty("schema") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private Map schema = new LinkedHashMap<>(); + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public FirmwareSchemaSpec() { + } + + public FirmwareSchemaSpec(String hardwareModel, String hardwareVendor, Map schema) { + super(); + this.hardwareModel = hardwareModel; + this.hardwareVendor = hardwareVendor; + this.schema = schema; + } + + @JsonProperty("hardwareModel") + public String getHardwareModel() { + return hardwareModel; + } + + @JsonProperty("hardwareModel") + public void setHardwareModel(String hardwareModel) { + this.hardwareModel = hardwareModel; + } + + @JsonProperty("hardwareVendor") + public String getHardwareVendor() { + return hardwareVendor; + } + + @JsonProperty("hardwareVendor") + public void setHardwareVendor(String hardwareVendor) { + this.hardwareVendor = hardwareVendor; + } + + @JsonProperty("schema") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public Map getSchema() { + return schema; + } + + @JsonProperty("schema") + public void setSchema(Map schema) { + this.schema = schema; + } + + @JsonIgnore + public FirmwareSchemaSpecBuilder edit() { + return new FirmwareSchemaSpecBuilder(this); + } + + @JsonIgnore + public FirmwareSchemaSpecBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/FirmwareSchemaSpecSchema.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/FirmwareSchemaSpecSchema.java new file mode 100644 index 00000000000..b12c4a0497a --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/FirmwareSchemaSpecSchema.java @@ -0,0 +1,210 @@ + +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "allowable_values", + "attribute_type", + "lower_bound", + "max_length", + "min_length", + "read_only", + "unique", + "upper_bound" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class FirmwareSchemaSpecSchema implements Editable , KubernetesResource +{ + + @JsonProperty("allowable_values") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List allowable_values = new ArrayList<>(); + @JsonProperty("attribute_type") + private String attribute_type; + @JsonProperty("lower_bound") + private Integer lower_bound; + @JsonProperty("max_length") + private Integer max_length; + @JsonProperty("min_length") + private Integer min_length; + @JsonProperty("read_only") + private Boolean read_only; + @JsonProperty("unique") + private Boolean unique; + @JsonProperty("upper_bound") + private Integer upper_bound; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public FirmwareSchemaSpecSchema() { + } + + public FirmwareSchemaSpecSchema(List allowable_values, String attribute_type, Integer lower_bound, Integer max_length, Integer min_length, Boolean read_only, Boolean unique, Integer upper_bound) { + super(); + this.allowable_values = allowable_values; + this.attribute_type = attribute_type; + this.lower_bound = lower_bound; + this.max_length = max_length; + this.min_length = min_length; + this.read_only = read_only; + this.unique = unique; + this.upper_bound = upper_bound; + } + + @JsonProperty("allowable_values") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getAllowable_values() { + return allowable_values; + } + + @JsonProperty("allowable_values") + public void setAllowable_values(List allowable_values) { + this.allowable_values = allowable_values; + } + + @JsonProperty("attribute_type") + public String getAttribute_type() { + return attribute_type; + } + + @JsonProperty("attribute_type") + public void setAttribute_type(String attribute_type) { + this.attribute_type = attribute_type; + } + + @JsonProperty("lower_bound") + public Integer getLower_bound() { + return lower_bound; + } + + @JsonProperty("lower_bound") + public void setLower_bound(Integer lower_bound) { + this.lower_bound = lower_bound; + } + + @JsonProperty("max_length") + public Integer getMax_length() { + return max_length; + } + + @JsonProperty("max_length") + public void setMax_length(Integer max_length) { + this.max_length = max_length; + } + + @JsonProperty("min_length") + public Integer getMin_length() { + return min_length; + } + + @JsonProperty("min_length") + public void setMin_length(Integer min_length) { + this.min_length = min_length; + } + + @JsonProperty("read_only") + public Boolean getRead_only() { + return read_only; + } + + @JsonProperty("read_only") + public void setRead_only(Boolean read_only) { + this.read_only = read_only; + } + + @JsonProperty("unique") + public Boolean getUnique() { + return unique; + } + + @JsonProperty("unique") + public void setUnique(Boolean unique) { + this.unique = unique; + } + + @JsonProperty("upper_bound") + public Integer getUpper_bound() { + return upper_bound; + } + + @JsonProperty("upper_bound") + public void setUpper_bound(Integer upper_bound) { + this.upper_bound = upper_bound; + } + + @JsonIgnore + public FirmwareSchemaSpecSchemaBuilder edit() { + return new FirmwareSchemaSpecSchemaBuilder(this); + } + + @JsonIgnore + public FirmwareSchemaSpecSchemaBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HardwareData.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HardwareData.java new file mode 100644 index 00000000000..b450c6752a8 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HardwareData.java @@ -0,0 +1,190 @@ + +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +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.builder.Editable; +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.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.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 +@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("metal3.io") +@Generated("jsonschema2pojo") +public class HardwareData implements Editable , HasMetadata, Namespaced +{ + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + private String apiVersion = "metal3.io/v1alpha1"; + /** + * + * (Required) + * + */ + @JsonProperty("kind") + private String kind = "HardwareData"; + @JsonProperty("metadata") + private ObjectMeta metadata; + @JsonProperty("spec") + private HardwareDataSpec spec; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public HardwareData() { + } + + public HardwareData(String apiVersion, String kind, ObjectMeta metadata, HardwareDataSpec 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 ObjectMeta getMetadata() { + return metadata; + } + + @JsonProperty("metadata") + public void setMetadata(ObjectMeta metadata) { + this.metadata = metadata; + } + + @JsonProperty("spec") + public HardwareDataSpec getSpec() { + return spec; + } + + @JsonProperty("spec") + public void setSpec(HardwareDataSpec spec) { + this.spec = spec; + } + + @JsonIgnore + public HardwareDataBuilder edit() { + return new HardwareDataBuilder(this); + } + + @JsonIgnore + public HardwareDataBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/EgressRouterList.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HardwareDataList.java similarity index 83% rename from kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/EgressRouterList.java rename to kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HardwareDataList.java index 7aac9f10748..f48b3c68e95 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/EgressRouterList.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HardwareDataList.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.miscellaneous.network.operator.v1; +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -64,10 +64,10 @@ @TemplateTransformations({ @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) }) -@Version("v1") -@Group("network.operator.openshift.io") +@Version("v1alpha1") +@Group("metal3.io") @Generated("jsonschema2pojo") -public class EgressRouterList implements Editable , KubernetesResource, KubernetesResourceList +public class HardwareDataList implements Editable , KubernetesResource, KubernetesResourceList { /** @@ -76,17 +76,17 @@ public class EgressRouterList implements Editable , Kub * */ @JsonProperty("apiVersion") - private String apiVersion = "network.operator.openshift.io/v1"; + private String apiVersion = "metal3.io/v1alpha1"; @JsonProperty("items") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List items = new ArrayList<>(); + private List items = new ArrayList<>(); /** * * (Required) * */ @JsonProperty("kind") - private String kind = "EgressRouterList"; + private String kind = "HardwareDataList"; @JsonProperty("metadata") private ListMeta metadata; @JsonIgnore @@ -96,10 +96,10 @@ public class EgressRouterList implements Editable , Kub * No args constructor for use in serialization * */ - public EgressRouterList() { + public HardwareDataList() { } - public EgressRouterList(String apiVersion, List items, String kind, ListMeta metadata) { + public HardwareDataList(String apiVersion, List items, String kind, ListMeta metadata) { super(); this.apiVersion = apiVersion; this.items = items; @@ -129,12 +129,12 @@ public void setApiVersion(String apiVersion) { @JsonProperty("items") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getItems() { + public List getItems() { return items; } @JsonProperty("items") - public void setItems(List items) { + public void setItems(List items) { this.items = items; } @@ -169,12 +169,12 @@ public void setMetadata(ListMeta metadata) { } @JsonIgnore - public EgressRouterListBuilder edit() { - return new EgressRouterListBuilder(this); + public HardwareDataListBuilder edit() { + return new HardwareDataListBuilder(this); } @JsonIgnore - public EgressRouterListBuilder toBuilder() { + public HardwareDataListBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HardwareDataSpec.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HardwareDataSpec.java new file mode 100644 index 00000000000..2ec183df83d --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HardwareDataSpec.java @@ -0,0 +1,108 @@ + +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "hardware" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class HardwareDataSpec implements Editable , KubernetesResource +{ + + @JsonProperty("hardware") + private HardwareDataSpecHardware hardware; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public HardwareDataSpec() { + } + + public HardwareDataSpec(HardwareDataSpecHardware hardware) { + super(); + this.hardware = hardware; + } + + @JsonProperty("hardware") + public HardwareDataSpecHardware getHardware() { + return hardware; + } + + @JsonProperty("hardware") + public void setHardware(HardwareDataSpecHardware hardware) { + this.hardware = hardware; + } + + @JsonIgnore + public HardwareDataSpecBuilder edit() { + return new HardwareDataSpecBuilder(this); + } + + @JsonIgnore + public HardwareDataSpecBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/CPU.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HardwareDataSpecHCpu.java similarity index 91% rename from kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/CPU.java rename to kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HardwareDataSpecHCpu.java index 3915ff1e623..c7f78d1bb70 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/CPU.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HardwareDataSpecHCpu.java @@ -57,7 +57,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class CPU implements Editable , KubernetesResource +public class HardwareDataSpecHCpu implements Editable , KubernetesResource { @JsonProperty("arch") @@ -78,10 +78,10 @@ public class CPU implements Editable , KubernetesResource * No args constructor for use in serialization * */ - public CPU() { + public HardwareDataSpecHCpu() { } - public CPU(String arch, Double clockMegahertz, Integer count, List flags, String model) { + public HardwareDataSpecHCpu(String arch, Double clockMegahertz, Integer count, List flags, String model) { super(); this.arch = arch; this.clockMegahertz = clockMegahertz; @@ -142,12 +142,12 @@ public void setModel(String model) { } @JsonIgnore - public CPUBuilder edit() { - return new CPUBuilder(this); + public HardwareDataSpecHCpuBuilder edit() { + return new HardwareDataSpecHCpuBuilder(this); } @JsonIgnore - public CPUBuilder toBuilder() { + public HardwareDataSpecHCpuBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BIOS.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HardwareDataSpecHFBios.java similarity index 90% rename from kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BIOS.java rename to kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HardwareDataSpecHFBios.java index c34bbb09225..59f7c812aaa 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BIOS.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HardwareDataSpecHFBios.java @@ -53,7 +53,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class BIOS implements Editable , KubernetesResource +public class HardwareDataSpecHFBios implements Editable , KubernetesResource { @JsonProperty("date") @@ -69,10 +69,10 @@ public class BIOS implements Editable , KubernetesResource * No args constructor for use in serialization * */ - public BIOS() { + public HardwareDataSpecHFBios() { } - public BIOS(String date, String vendor, String version) { + public HardwareDataSpecHFBios(String date, String vendor, String version) { super(); this.date = date; this.vendor = vendor; @@ -110,12 +110,12 @@ public void setVersion(String version) { } @JsonIgnore - public BIOSBuilder edit() { - return new BIOSBuilder(this); + public HardwareDataSpecHFBiosBuilder edit() { + return new HardwareDataSpecHFBiosBuilder(this); } @JsonIgnore - public BIOSBuilder toBuilder() { + public HardwareDataSpecHFBiosBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/Firmware.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HardwareDataSpecHFirmware.java similarity index 85% rename from kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/Firmware.java rename to kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HardwareDataSpecHFirmware.java index b83573e5855..69f5d10765b 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/Firmware.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HardwareDataSpecHFirmware.java @@ -51,11 +51,11 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class Firmware implements Editable , KubernetesResource +public class HardwareDataSpecHFirmware implements Editable , KubernetesResource { @JsonProperty("bios") - private BIOS bios; + private HardwareDataSpecHFBios bios; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -63,31 +63,31 @@ public class Firmware implements Editable , KubernetesResource * No args constructor for use in serialization * */ - public Firmware() { + public HardwareDataSpecHFirmware() { } - public Firmware(BIOS bios) { + public HardwareDataSpecHFirmware(HardwareDataSpecHFBios bios) { super(); this.bios = bios; } @JsonProperty("bios") - public BIOS getBios() { + public HardwareDataSpecHFBios getBios() { return bios; } @JsonProperty("bios") - public void setBios(BIOS bios) { + public void setBios(HardwareDataSpecHFBios bios) { this.bios = bios; } @JsonIgnore - public FirmwareBuilder edit() { - return new FirmwareBuilder(this); + public HardwareDataSpecHFirmwareBuilder edit() { + return new HardwareDataSpecHFirmwareBuilder(this); } @JsonIgnore - public FirmwareBuilder toBuilder() { + public HardwareDataSpecHFirmwareBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/VLAN.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HardwareDataSpecHNVlans.java similarity index 90% rename from kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/VLAN.java rename to kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HardwareDataSpecHNVlans.java index 282ee5938fb..fbecd1923e7 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/VLAN.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HardwareDataSpecHNVlans.java @@ -52,7 +52,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class VLAN implements Editable , KubernetesResource +public class HardwareDataSpecHNVlans implements Editable , KubernetesResource { @JsonProperty("id") @@ -66,10 +66,10 @@ public class VLAN implements Editable , KubernetesResource * No args constructor for use in serialization * */ - public VLAN() { + public HardwareDataSpecHNVlans() { } - public VLAN(Integer id, String name) { + public HardwareDataSpecHNVlans(Integer id, String name) { super(); this.id = id; this.name = name; @@ -96,12 +96,12 @@ public void setName(String name) { } @JsonIgnore - public VLANBuilder edit() { - return new VLANBuilder(this); + public HardwareDataSpecHNVlansBuilder edit() { + return new HardwareDataSpecHNVlansBuilder(this); } @JsonIgnore - public VLANBuilder toBuilder() { + public HardwareDataSpecHNVlansBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/NIC.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HardwareDataSpecHNics.java similarity index 88% rename from kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/NIC.java rename to kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HardwareDataSpecHNics.java index 743c77dfc9f..66f2ca3f7d2 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/NIC.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HardwareDataSpecHNics.java @@ -60,7 +60,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class NIC implements Editable , KubernetesResource +public class HardwareDataSpecHNics implements Editable , KubernetesResource { @JsonProperty("ip") @@ -79,7 +79,7 @@ public class NIC implements Editable , KubernetesResource private Integer vlanId; @JsonProperty("vlans") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List vlans = new ArrayList<>(); + private List vlans = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -87,10 +87,10 @@ public class NIC implements Editable , KubernetesResource * No args constructor for use in serialization * */ - public NIC() { + public HardwareDataSpecHNics() { } - public NIC(String ip, String mac, String model, String name, Boolean pxe, Integer speedGbps, Integer vlanId, List vlans) { + public HardwareDataSpecHNics(String ip, String mac, String model, String name, Boolean pxe, Integer speedGbps, Integer vlanId, List vlans) { super(); this.ip = ip; this.mac = mac; @@ -174,22 +174,22 @@ public void setVlanId(Integer vlanId) { @JsonProperty("vlans") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getVlans() { + public List getVlans() { return vlans; } @JsonProperty("vlans") - public void setVlans(List vlans) { + public void setVlans(List vlans) { this.vlans = vlans; } @JsonIgnore - public NICBuilder edit() { - return new NICBuilder(this); + public HardwareDataSpecHNicsBuilder edit() { + return new HardwareDataSpecHNicsBuilder(this); } @JsonIgnore - public NICBuilder toBuilder() { + public HardwareDataSpecHNicsBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/Storage.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HardwareDataSpecHStorage.java similarity index 92% rename from kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/Storage.java rename to kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HardwareDataSpecHStorage.java index 8b4da97bf43..f551175c41f 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/Storage.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HardwareDataSpecHStorage.java @@ -64,7 +64,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class Storage implements Editable , KubernetesResource +public class HardwareDataSpecHStorage implements Editable , KubernetesResource { @JsonProperty("alternateNames") @@ -99,10 +99,10 @@ public class Storage implements Editable , KubernetesResource * No args constructor for use in serialization * */ - public Storage() { + public HardwareDataSpecHStorage() { } - public Storage(List alternateNames, String hctl, String model, String name, Boolean rotational, String serialNumber, Long sizeBytes, String type, String vendor, String wwn, String wwnVendorExtension, String wwnWithExtension) { + public HardwareDataSpecHStorage(List alternateNames, String hctl, String model, String name, Boolean rotational, String serialNumber, Long sizeBytes, String type, String vendor, String wwn, String wwnVendorExtension, String wwnWithExtension) { super(); this.alternateNames = alternateNames; this.hctl = hctl; @@ -240,12 +240,12 @@ public void setWwnWithExtension(String wwnWithExtension) { } @JsonIgnore - public StorageBuilder edit() { - return new StorageBuilder(this); + public HardwareDataSpecHStorageBuilder edit() { + return new HardwareDataSpecHStorageBuilder(this); } @JsonIgnore - public StorageBuilder toBuilder() { + public HardwareDataSpecHStorageBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HardwareSystemVendor.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HardwareDataSpecHSystemVendor.java similarity index 89% rename from kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HardwareSystemVendor.java rename to kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HardwareDataSpecHSystemVendor.java index 1ecd0b1571a..d2522f9fa7c 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HardwareSystemVendor.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HardwareDataSpecHSystemVendor.java @@ -53,7 +53,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class HardwareSystemVendor implements Editable , KubernetesResource +public class HardwareDataSpecHSystemVendor implements Editable , KubernetesResource { @JsonProperty("manufacturer") @@ -69,10 +69,10 @@ public class HardwareSystemVendor implements Editable , KubernetesResource +public class HardwareDataSpecHardware implements Editable , KubernetesResource { @JsonProperty("cpu") - private CPU cpu; + private HardwareDataSpecHCpu cpu; @JsonProperty("firmware") - private Firmware firmware; + private HardwareDataSpecHFirmware firmware; @JsonProperty("hostname") private String hostname; @JsonProperty("nics") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List nics = new ArrayList<>(); + private List nics = new ArrayList<>(); @JsonProperty("ramMebibytes") private Integer ramMebibytes; @JsonProperty("storage") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List storage = new ArrayList<>(); + private List storage = new ArrayList<>(); @JsonProperty("systemVendor") - private HardwareSystemVendor systemVendor; + private HardwareDataSpecHSystemVendor systemVendor; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -85,10 +85,10 @@ public class HardwareDetails implements Editable , Kuber * No args constructor for use in serialization * */ - public HardwareDetails() { + public HardwareDataSpecHardware() { } - public HardwareDetails(CPU cpu, Firmware firmware, String hostname, List nics, Integer ramMebibytes, List storage, HardwareSystemVendor systemVendor) { + public HardwareDataSpecHardware(HardwareDataSpecHCpu cpu, HardwareDataSpecHFirmware firmware, String hostname, List nics, Integer ramMebibytes, List storage, HardwareDataSpecHSystemVendor systemVendor) { super(); this.cpu = cpu; this.firmware = firmware; @@ -100,22 +100,22 @@ public HardwareDetails(CPU cpu, Firmware firmware, String hostname, List ni } @JsonProperty("cpu") - public CPU getCpu() { + public HardwareDataSpecHCpu getCpu() { return cpu; } @JsonProperty("cpu") - public void setCpu(CPU cpu) { + public void setCpu(HardwareDataSpecHCpu cpu) { this.cpu = cpu; } @JsonProperty("firmware") - public Firmware getFirmware() { + public HardwareDataSpecHFirmware getFirmware() { return firmware; } @JsonProperty("firmware") - public void setFirmware(Firmware firmware) { + public void setFirmware(HardwareDataSpecHFirmware firmware) { this.firmware = firmware; } @@ -131,12 +131,12 @@ public void setHostname(String hostname) { @JsonProperty("nics") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getNics() { + public List getNics() { return nics; } @JsonProperty("nics") - public void setNics(List nics) { + public void setNics(List nics) { this.nics = nics; } @@ -152,32 +152,32 @@ public void setRamMebibytes(Integer ramMebibytes) { @JsonProperty("storage") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getStorage() { + public List getStorage() { return storage; } @JsonProperty("storage") - public void setStorage(List storage) { + public void setStorage(List storage) { this.storage = storage; } @JsonProperty("systemVendor") - public HardwareSystemVendor getSystemVendor() { + public HardwareDataSpecHSystemVendor getSystemVendor() { return systemVendor; } @JsonProperty("systemVendor") - public void setSystemVendor(HardwareSystemVendor systemVendor) { + public void setSystemVendor(HardwareDataSpecHSystemVendor systemVendor) { this.systemVendor = systemVendor; } @JsonIgnore - public HardwareDetailsBuilder edit() { - return new HardwareDetailsBuilder(this); + public HardwareDataSpecHardwareBuilder edit() { + return new HardwareDataSpecHardwareBuilder(this); } @JsonIgnore - public HardwareDetailsBuilder toBuilder() { + public HardwareDataSpecHardwareBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareComponents.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareComponents.java new file mode 100644 index 00000000000..eb151b49cea --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareComponents.java @@ -0,0 +1,204 @@ + +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +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.builder.Editable; +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.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.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 +@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("metal3.io") +@Generated("jsonschema2pojo") +public class HostFirmwareComponents implements Editable , HasMetadata, Namespaced +{ + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + private String apiVersion = "metal3.io/v1alpha1"; + /** + * + * (Required) + * + */ + @JsonProperty("kind") + private String kind = "HostFirmwareComponents"; + @JsonProperty("metadata") + private ObjectMeta metadata; + @JsonProperty("spec") + private HostFirmwareComponentsSpec spec; + @JsonProperty("status") + private HostFirmwareComponentsStatus status; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public HostFirmwareComponents() { + } + + public HostFirmwareComponents(String apiVersion, String kind, ObjectMeta metadata, HostFirmwareComponentsSpec spec, HostFirmwareComponentsStatus 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 ObjectMeta getMetadata() { + return metadata; + } + + @JsonProperty("metadata") + public void setMetadata(ObjectMeta metadata) { + this.metadata = metadata; + } + + @JsonProperty("spec") + public HostFirmwareComponentsSpec getSpec() { + return spec; + } + + @JsonProperty("spec") + public void setSpec(HostFirmwareComponentsSpec spec) { + this.spec = spec; + } + + @JsonProperty("status") + public HostFirmwareComponentsStatus getStatus() { + return status; + } + + @JsonProperty("status") + public void setStatus(HostFirmwareComponentsStatus status) { + this.status = status; + } + + @JsonIgnore + public HostFirmwareComponentsBuilder edit() { + return new HostFirmwareComponentsBuilder(this); + } + + @JsonIgnore + public HostFirmwareComponentsBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareComponentsList.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareComponentsList.java new file mode 100644 index 00000000000..fc2b59582fd --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareComponentsList.java @@ -0,0 +1,195 @@ + +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +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.builder.Editable; +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.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 +@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("metal3.io") +@Generated("jsonschema2pojo") +public class HostFirmwareComponentsList implements Editable , KubernetesResource, KubernetesResourceList +{ + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + private String apiVersion = "metal3.io/v1alpha1"; + @JsonProperty("items") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List items = new ArrayList<>(); + /** + * + * (Required) + * + */ + @JsonProperty("kind") + private String kind = "HostFirmwareComponentsList"; + @JsonProperty("metadata") + private ListMeta metadata; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public HostFirmwareComponentsList() { + } + + public HostFirmwareComponentsList(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") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + 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; + } + + @JsonIgnore + public HostFirmwareComponentsListBuilder edit() { + return new HostFirmwareComponentsListBuilder(this); + } + + @JsonIgnore + public HostFirmwareComponentsListBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/EgressNetworkPolicySpec.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareComponentsSpec.java similarity index 77% rename from kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/EgressNetworkPolicySpec.java rename to kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareComponentsSpec.java index dbc04fcd71d..562dbe2d934 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/EgressNetworkPolicySpec.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareComponentsSpec.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model; +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -33,7 +33,7 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "egress" + "updates" }) @ToString @EqualsAndHashCode @@ -53,12 +53,12 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class EgressNetworkPolicySpec implements Editable , KubernetesResource +public class HostFirmwareComponentsSpec implements Editable , KubernetesResource { - @JsonProperty("egress") + @JsonProperty("updates") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List egress = new ArrayList<>(); + private List updates = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -66,32 +66,32 @@ public class EgressNetworkPolicySpec implements Editable egress) { + public HostFirmwareComponentsSpec(List updates) { super(); - this.egress = egress; + this.updates = updates; } - @JsonProperty("egress") + @JsonProperty("updates") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getEgress() { - return egress; + public List getUpdates() { + return updates; } - @JsonProperty("egress") - public void setEgress(List egress) { - this.egress = egress; + @JsonProperty("updates") + public void setUpdates(List updates) { + this.updates = updates; } @JsonIgnore - public EgressNetworkPolicySpecBuilder edit() { - return new EgressNetworkPolicySpecBuilder(this); + public HostFirmwareComponentsSpecBuilder edit() { + return new HostFirmwareComponentsSpecBuilder(this); } @JsonIgnore - public EgressNetworkPolicySpecBuilder toBuilder() { + public HostFirmwareComponentsSpecBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareComponentsSpecUpdates.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareComponentsSpecUpdates.java new file mode 100644 index 00000000000..1859514d0d9 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareComponentsSpecUpdates.java @@ -0,0 +1,122 @@ + +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "component", + "url" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class HostFirmwareComponentsSpecUpdates implements Editable , KubernetesResource +{ + + @JsonProperty("component") + private String component; + @JsonProperty("url") + private String url; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public HostFirmwareComponentsSpecUpdates() { + } + + public HostFirmwareComponentsSpecUpdates(String component, String url) { + super(); + this.component = component; + this.url = url; + } + + @JsonProperty("component") + public String getComponent() { + return component; + } + + @JsonProperty("component") + public void setComponent(String component) { + this.component = component; + } + + @JsonProperty("url") + public String getUrl() { + return url; + } + + @JsonProperty("url") + public void setUrl(String url) { + this.url = url; + } + + @JsonIgnore + public HostFirmwareComponentsSpecUpdatesBuilder edit() { + return new HostFirmwareComponentsSpecUpdatesBuilder(this); + } + + @JsonIgnore + public HostFirmwareComponentsSpecUpdatesBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareComponentsStatus.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareComponentsStatus.java new file mode 100644 index 00000000000..f0a8fce576e --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareComponentsStatus.java @@ -0,0 +1,158 @@ + +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "components", + "conditions", + "lastUpdated", + "updates" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class HostFirmwareComponentsStatus implements Editable , KubernetesResource +{ + + @JsonProperty("components") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List components = new ArrayList<>(); + @JsonProperty("conditions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List conditions = new ArrayList<>(); + @JsonProperty("lastUpdated") + private String lastUpdated; + @JsonProperty("updates") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List updates = new ArrayList<>(); + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public HostFirmwareComponentsStatus() { + } + + public HostFirmwareComponentsStatus(List components, List conditions, String lastUpdated, List updates) { + super(); + this.components = components; + this.conditions = conditions; + this.lastUpdated = lastUpdated; + this.updates = updates; + } + + @JsonProperty("components") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getComponents() { + return components; + } + + @JsonProperty("components") + public void setComponents(List components) { + this.components = components; + } + + @JsonProperty("conditions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getConditions() { + return conditions; + } + + @JsonProperty("conditions") + public void setConditions(List conditions) { + this.conditions = conditions; + } + + @JsonProperty("lastUpdated") + public String getLastUpdated() { + return lastUpdated; + } + + @JsonProperty("lastUpdated") + public void setLastUpdated(String lastUpdated) { + this.lastUpdated = lastUpdated; + } + + @JsonProperty("updates") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getUpdates() { + return updates; + } + + @JsonProperty("updates") + public void setUpdates(List updates) { + this.updates = updates; + } + + @JsonIgnore + public HostFirmwareComponentsStatusBuilder edit() { + return new HostFirmwareComponentsStatusBuilder(this); + } + + @JsonIgnore + public HostFirmwareComponentsStatusBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareComponentsStatusComponents.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareComponentsStatusComponents.java new file mode 100644 index 00000000000..344b281821a --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareComponentsStatusComponents.java @@ -0,0 +1,164 @@ + +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "component", + "currentVersion", + "initialVersion", + "lastVersionFlashed", + "updatedAt" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class HostFirmwareComponentsStatusComponents implements Editable , KubernetesResource +{ + + @JsonProperty("component") + private String component; + @JsonProperty("currentVersion") + private String currentVersion; + @JsonProperty("initialVersion") + private String initialVersion; + @JsonProperty("lastVersionFlashed") + private String lastVersionFlashed; + @JsonProperty("updatedAt") + private String updatedAt; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public HostFirmwareComponentsStatusComponents() { + } + + public HostFirmwareComponentsStatusComponents(String component, String currentVersion, String initialVersion, String lastVersionFlashed, String updatedAt) { + super(); + this.component = component; + this.currentVersion = currentVersion; + this.initialVersion = initialVersion; + this.lastVersionFlashed = lastVersionFlashed; + this.updatedAt = updatedAt; + } + + @JsonProperty("component") + public String getComponent() { + return component; + } + + @JsonProperty("component") + public void setComponent(String component) { + this.component = component; + } + + @JsonProperty("currentVersion") + public String getCurrentVersion() { + return currentVersion; + } + + @JsonProperty("currentVersion") + public void setCurrentVersion(String currentVersion) { + this.currentVersion = currentVersion; + } + + @JsonProperty("initialVersion") + public String getInitialVersion() { + return initialVersion; + } + + @JsonProperty("initialVersion") + public void setInitialVersion(String initialVersion) { + this.initialVersion = initialVersion; + } + + @JsonProperty("lastVersionFlashed") + public String getLastVersionFlashed() { + return lastVersionFlashed; + } + + @JsonProperty("lastVersionFlashed") + public void setLastVersionFlashed(String lastVersionFlashed) { + this.lastVersionFlashed = lastVersionFlashed; + } + + @JsonProperty("updatedAt") + public String getUpdatedAt() { + return updatedAt; + } + + @JsonProperty("updatedAt") + public void setUpdatedAt(String updatedAt) { + this.updatedAt = updatedAt; + } + + @JsonIgnore + public HostFirmwareComponentsStatusComponentsBuilder edit() { + return new HostFirmwareComponentsStatusComponentsBuilder(this); + } + + @JsonIgnore + public HostFirmwareComponentsStatusComponentsBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareComponentsStatusConditions.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareComponentsStatusConditions.java new file mode 100644 index 00000000000..dfca3d372ac --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareComponentsStatusConditions.java @@ -0,0 +1,178 @@ + +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "lastTransitionTime", + "message", + "observedGeneration", + "reason", + "status", + "type" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class HostFirmwareComponentsStatusConditions implements Editable , KubernetesResource +{ + + @JsonProperty("lastTransitionTime") + private String lastTransitionTime; + @JsonProperty("message") + private String message; + @JsonProperty("observedGeneration") + private Long observedGeneration; + @JsonProperty("reason") + private String reason; + @JsonProperty("status") + private String status; + @JsonProperty("type") + private String type; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public HostFirmwareComponentsStatusConditions() { + } + + public HostFirmwareComponentsStatusConditions(String lastTransitionTime, String message, Long observedGeneration, String reason, String status, 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 String getMessage() { + return message; + } + + @JsonProperty("message") + public void setMessage(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 String getReason() { + return reason; + } + + @JsonProperty("reason") + public void setReason(String reason) { + this.reason = reason; + } + + @JsonProperty("status") + public String getStatus() { + return status; + } + + @JsonProperty("status") + public void setStatus(String status) { + this.status = status; + } + + @JsonProperty("type") + public String getType() { + return type; + } + + @JsonProperty("type") + public void setType(String type) { + this.type = type; + } + + @JsonIgnore + public HostFirmwareComponentsStatusConditionsBuilder edit() { + return new HostFirmwareComponentsStatusConditionsBuilder(this); + } + + @JsonIgnore + public HostFirmwareComponentsStatusConditionsBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareComponentsStatusUpdates.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareComponentsStatusUpdates.java new file mode 100644 index 00000000000..267294c03cc --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareComponentsStatusUpdates.java @@ -0,0 +1,122 @@ + +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "component", + "url" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class HostFirmwareComponentsStatusUpdates implements Editable , KubernetesResource +{ + + @JsonProperty("component") + private String component; + @JsonProperty("url") + private String url; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public HostFirmwareComponentsStatusUpdates() { + } + + public HostFirmwareComponentsStatusUpdates(String component, String url) { + super(); + this.component = component; + this.url = url; + } + + @JsonProperty("component") + public String getComponent() { + return component; + } + + @JsonProperty("component") + public void setComponent(String component) { + this.component = component; + } + + @JsonProperty("url") + public String getUrl() { + return url; + } + + @JsonProperty("url") + public void setUrl(String url) { + this.url = url; + } + + @JsonIgnore + public HostFirmwareComponentsStatusUpdatesBuilder edit() { + return new HostFirmwareComponentsStatusUpdatesBuilder(this); + } + + @JsonIgnore + public HostFirmwareComponentsStatusUpdatesBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareSettings.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareSettings.java new file mode 100644 index 00000000000..30ab79ea951 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareSettings.java @@ -0,0 +1,204 @@ + +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +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.builder.Editable; +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.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.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 +@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("metal3.io") +@Generated("jsonschema2pojo") +public class HostFirmwareSettings implements Editable , HasMetadata, Namespaced +{ + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + private String apiVersion = "metal3.io/v1alpha1"; + /** + * + * (Required) + * + */ + @JsonProperty("kind") + private String kind = "HostFirmwareSettings"; + @JsonProperty("metadata") + private ObjectMeta metadata; + @JsonProperty("spec") + private HostFirmwareSettingsSpec spec; + @JsonProperty("status") + private HostFirmwareSettingsStatus status; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public HostFirmwareSettings() { + } + + public HostFirmwareSettings(String apiVersion, String kind, ObjectMeta metadata, HostFirmwareSettingsSpec spec, HostFirmwareSettingsStatus 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 ObjectMeta getMetadata() { + return metadata; + } + + @JsonProperty("metadata") + public void setMetadata(ObjectMeta metadata) { + this.metadata = metadata; + } + + @JsonProperty("spec") + public HostFirmwareSettingsSpec getSpec() { + return spec; + } + + @JsonProperty("spec") + public void setSpec(HostFirmwareSettingsSpec spec) { + this.spec = spec; + } + + @JsonProperty("status") + public HostFirmwareSettingsStatus getStatus() { + return status; + } + + @JsonProperty("status") + public void setStatus(HostFirmwareSettingsStatus status) { + this.status = status; + } + + @JsonIgnore + public HostFirmwareSettingsBuilder edit() { + return new HostFirmwareSettingsBuilder(this); + } + + @JsonIgnore + public HostFirmwareSettingsBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareSettingsList.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareSettingsList.java new file mode 100644 index 00000000000..0941d0d9a26 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareSettingsList.java @@ -0,0 +1,195 @@ + +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +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.builder.Editable; +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.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 +@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("metal3.io") +@Generated("jsonschema2pojo") +public class HostFirmwareSettingsList implements Editable , KubernetesResource, KubernetesResourceList +{ + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + private String apiVersion = "metal3.io/v1alpha1"; + @JsonProperty("items") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List items = new ArrayList<>(); + /** + * + * (Required) + * + */ + @JsonProperty("kind") + private String kind = "HostFirmwareSettingsList"; + @JsonProperty("metadata") + private ListMeta metadata; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public HostFirmwareSettingsList() { + } + + public HostFirmwareSettingsList(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") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + 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; + } + + @JsonIgnore + public HostFirmwareSettingsListBuilder edit() { + return new HostFirmwareSettingsListBuilder(this); + } + + @JsonIgnore + public HostFirmwareSettingsListBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareSettingsSpec.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareSettingsSpec.java new file mode 100644 index 00000000000..3936bad046b --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareSettingsSpec.java @@ -0,0 +1,112 @@ + +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "settings" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class HostFirmwareSettingsSpec implements Editable , KubernetesResource +{ + + @JsonProperty("settings") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializerForMap.class) + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private Map settings = new LinkedHashMap<>(); + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public HostFirmwareSettingsSpec() { + } + + public HostFirmwareSettingsSpec(Map settings) { + super(); + this.settings = settings; + } + + @JsonProperty("settings") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public Map getSettings() { + return settings; + } + + @JsonProperty("settings") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializerForMap.class) + public void setSettings(Map settings) { + this.settings = settings; + } + + @JsonIgnore + public HostFirmwareSettingsSpecBuilder edit() { + return new HostFirmwareSettingsSpecBuilder(this); + } + + @JsonIgnore + public HostFirmwareSettingsSpecBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareSettingsStatus.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareSettingsStatus.java new file mode 100644 index 00000000000..b198509e64b --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareSettingsStatus.java @@ -0,0 +1,156 @@ + +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "conditions", + "lastUpdated", + "schema", + "settings" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class HostFirmwareSettingsStatus implements Editable , KubernetesResource +{ + + @JsonProperty("conditions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List conditions = new ArrayList<>(); + @JsonProperty("lastUpdated") + private String lastUpdated; + @JsonProperty("schema") + private HostFirmwareSettingsStatusSchema schema; + @JsonProperty("settings") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private Map settings = new LinkedHashMap<>(); + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public HostFirmwareSettingsStatus() { + } + + public HostFirmwareSettingsStatus(List conditions, String lastUpdated, HostFirmwareSettingsStatusSchema schema, Map settings) { + super(); + this.conditions = conditions; + this.lastUpdated = lastUpdated; + this.schema = schema; + this.settings = settings; + } + + @JsonProperty("conditions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getConditions() { + return conditions; + } + + @JsonProperty("conditions") + public void setConditions(List conditions) { + this.conditions = conditions; + } + + @JsonProperty("lastUpdated") + public String getLastUpdated() { + return lastUpdated; + } + + @JsonProperty("lastUpdated") + public void setLastUpdated(String lastUpdated) { + this.lastUpdated = lastUpdated; + } + + @JsonProperty("schema") + public HostFirmwareSettingsStatusSchema getSchema() { + return schema; + } + + @JsonProperty("schema") + public void setSchema(HostFirmwareSettingsStatusSchema schema) { + this.schema = schema; + } + + @JsonProperty("settings") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public Map getSettings() { + return settings; + } + + @JsonProperty("settings") + public void setSettings(Map settings) { + this.settings = settings; + } + + @JsonIgnore + public HostFirmwareSettingsStatusBuilder edit() { + return new HostFirmwareSettingsStatusBuilder(this); + } + + @JsonIgnore + public HostFirmwareSettingsStatusBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareSettingsStatusConditions.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareSettingsStatusConditions.java new file mode 100644 index 00000000000..9b815f79e93 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareSettingsStatusConditions.java @@ -0,0 +1,178 @@ + +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "lastTransitionTime", + "message", + "observedGeneration", + "reason", + "status", + "type" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class HostFirmwareSettingsStatusConditions implements Editable , KubernetesResource +{ + + @JsonProperty("lastTransitionTime") + private String lastTransitionTime; + @JsonProperty("message") + private String message; + @JsonProperty("observedGeneration") + private Long observedGeneration; + @JsonProperty("reason") + private String reason; + @JsonProperty("status") + private String status; + @JsonProperty("type") + private String type; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public HostFirmwareSettingsStatusConditions() { + } + + public HostFirmwareSettingsStatusConditions(String lastTransitionTime, String message, Long observedGeneration, String reason, String status, 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 String getMessage() { + return message; + } + + @JsonProperty("message") + public void setMessage(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 String getReason() { + return reason; + } + + @JsonProperty("reason") + public void setReason(String reason) { + this.reason = reason; + } + + @JsonProperty("status") + public String getStatus() { + return status; + } + + @JsonProperty("status") + public void setStatus(String status) { + this.status = status; + } + + @JsonProperty("type") + public String getType() { + return type; + } + + @JsonProperty("type") + public void setType(String type) { + this.type = type; + } + + @JsonIgnore + public HostFirmwareSettingsStatusConditionsBuilder edit() { + return new HostFirmwareSettingsStatusConditionsBuilder(this); + } + + @JsonIgnore + public HostFirmwareSettingsStatusConditionsBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareSettingsStatusSchema.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareSettingsStatusSchema.java new file mode 100644 index 00000000000..2004b15bdd6 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HostFirmwareSettingsStatusSchema.java @@ -0,0 +1,122 @@ + +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "name", + "namespace" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class HostFirmwareSettingsStatusSchema implements Editable , KubernetesResource +{ + + @JsonProperty("name") + private String name; + @JsonProperty("namespace") + private String namespace; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public HostFirmwareSettingsStatusSchema() { + } + + public HostFirmwareSettingsStatusSchema(String name, String namespace) { + super(); + this.name = name; + this.namespace = namespace; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonProperty("namespace") + public String getNamespace() { + return namespace; + } + + @JsonProperty("namespace") + public void setNamespace(String namespace) { + this.namespace = namespace; + } + + @JsonIgnore + public HostFirmwareSettingsStatusSchemaBuilder edit() { + return new HostFirmwareSettingsStatusSchemaBuilder(this); + } + + @JsonIgnore + public HostFirmwareSettingsStatusSchemaBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/PreprovisioningImage.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/PreprovisioningImage.java new file mode 100644 index 00000000000..576384415ea --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/PreprovisioningImage.java @@ -0,0 +1,204 @@ + +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +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.builder.Editable; +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.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.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 +@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("metal3.io") +@Generated("jsonschema2pojo") +public class PreprovisioningImage implements Editable , HasMetadata, Namespaced +{ + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + private String apiVersion = "metal3.io/v1alpha1"; + /** + * + * (Required) + * + */ + @JsonProperty("kind") + private String kind = "PreprovisioningImage"; + @JsonProperty("metadata") + private ObjectMeta metadata; + @JsonProperty("spec") + private PreprovisioningImageSpec spec; + @JsonProperty("status") + private PreprovisioningImageStatus status; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public PreprovisioningImage() { + } + + public PreprovisioningImage(String apiVersion, String kind, ObjectMeta metadata, PreprovisioningImageSpec spec, PreprovisioningImageStatus 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 ObjectMeta getMetadata() { + return metadata; + } + + @JsonProperty("metadata") + public void setMetadata(ObjectMeta metadata) { + this.metadata = metadata; + } + + @JsonProperty("spec") + public PreprovisioningImageSpec getSpec() { + return spec; + } + + @JsonProperty("spec") + public void setSpec(PreprovisioningImageSpec spec) { + this.spec = spec; + } + + @JsonProperty("status") + public PreprovisioningImageStatus getStatus() { + return status; + } + + @JsonProperty("status") + public void setStatus(PreprovisioningImageStatus status) { + this.status = status; + } + + @JsonIgnore + public PreprovisioningImageBuilder edit() { + return new PreprovisioningImageBuilder(this); + } + + @JsonIgnore + public PreprovisioningImageBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/PreprovisioningImageList.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/PreprovisioningImageList.java new file mode 100644 index 00000000000..0794530c52d --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/PreprovisioningImageList.java @@ -0,0 +1,195 @@ + +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +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.builder.Editable; +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.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 +@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("metal3.io") +@Generated("jsonschema2pojo") +public class PreprovisioningImageList implements Editable , KubernetesResource, KubernetesResourceList +{ + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + private String apiVersion = "metal3.io/v1alpha1"; + @JsonProperty("items") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List items = new ArrayList<>(); + /** + * + * (Required) + * + */ + @JsonProperty("kind") + private String kind = "PreprovisioningImageList"; + @JsonProperty("metadata") + private ListMeta metadata; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public PreprovisioningImageList() { + } + + public PreprovisioningImageList(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") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + 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; + } + + @JsonIgnore + public PreprovisioningImageListBuilder edit() { + return new PreprovisioningImageListBuilder(this); + } + + @JsonIgnore + public PreprovisioningImageListBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/PreprovisioningImageSpec.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/PreprovisioningImageSpec.java new file mode 100644 index 00000000000..7688ff5ae15 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/PreprovisioningImageSpec.java @@ -0,0 +1,140 @@ + +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "acceptFormats", + "architecture", + "networkDataName" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class PreprovisioningImageSpec implements Editable , KubernetesResource +{ + + @JsonProperty("acceptFormats") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List acceptFormats = new ArrayList<>(); + @JsonProperty("architecture") + private String architecture; + @JsonProperty("networkDataName") + private String networkDataName; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public PreprovisioningImageSpec() { + } + + public PreprovisioningImageSpec(List acceptFormats, String architecture, String networkDataName) { + super(); + this.acceptFormats = acceptFormats; + this.architecture = architecture; + this.networkDataName = networkDataName; + } + + @JsonProperty("acceptFormats") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getAcceptFormats() { + return acceptFormats; + } + + @JsonProperty("acceptFormats") + public void setAcceptFormats(List acceptFormats) { + this.acceptFormats = acceptFormats; + } + + @JsonProperty("architecture") + public String getArchitecture() { + return architecture; + } + + @JsonProperty("architecture") + public void setArchitecture(String architecture) { + this.architecture = architecture; + } + + @JsonProperty("networkDataName") + public String getNetworkDataName() { + return networkDataName; + } + + @JsonProperty("networkDataName") + public void setNetworkDataName(String networkDataName) { + this.networkDataName = networkDataName; + } + + @JsonIgnore + public PreprovisioningImageSpecBuilder edit() { + return new PreprovisioningImageSpecBuilder(this); + } + + @JsonIgnore + public PreprovisioningImageSpecBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/PreprovisioningImageStatus.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/PreprovisioningImageStatus.java new file mode 100644 index 00000000000..7b29c9eda6c --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/PreprovisioningImageStatus.java @@ -0,0 +1,196 @@ + +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "architecture", + "conditions", + "extraKernelParams", + "format", + "imageUrl", + "kernelUrl", + "networkData" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class PreprovisioningImageStatus implements Editable , KubernetesResource +{ + + @JsonProperty("architecture") + private String architecture; + @JsonProperty("conditions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List conditions = new ArrayList<>(); + @JsonProperty("extraKernelParams") + private String extraKernelParams; + @JsonProperty("format") + private String format; + @JsonProperty("imageUrl") + private String imageUrl; + @JsonProperty("kernelUrl") + private String kernelUrl; + @JsonProperty("networkData") + private PreprovisioningImageStatusNetworkData networkData; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public PreprovisioningImageStatus() { + } + + public PreprovisioningImageStatus(String architecture, List conditions, String extraKernelParams, String format, String imageUrl, String kernelUrl, PreprovisioningImageStatusNetworkData networkData) { + super(); + this.architecture = architecture; + this.conditions = conditions; + this.extraKernelParams = extraKernelParams; + this.format = format; + this.imageUrl = imageUrl; + this.kernelUrl = kernelUrl; + this.networkData = networkData; + } + + @JsonProperty("architecture") + public String getArchitecture() { + return architecture; + } + + @JsonProperty("architecture") + public void setArchitecture(String architecture) { + this.architecture = architecture; + } + + @JsonProperty("conditions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getConditions() { + return conditions; + } + + @JsonProperty("conditions") + public void setConditions(List conditions) { + this.conditions = conditions; + } + + @JsonProperty("extraKernelParams") + public String getExtraKernelParams() { + return extraKernelParams; + } + + @JsonProperty("extraKernelParams") + public void setExtraKernelParams(String extraKernelParams) { + this.extraKernelParams = extraKernelParams; + } + + @JsonProperty("format") + public String getFormat() { + return format; + } + + @JsonProperty("format") + public void setFormat(String format) { + this.format = format; + } + + @JsonProperty("imageUrl") + public String getImageUrl() { + return imageUrl; + } + + @JsonProperty("imageUrl") + public void setImageUrl(String imageUrl) { + this.imageUrl = imageUrl; + } + + @JsonProperty("kernelUrl") + public String getKernelUrl() { + return kernelUrl; + } + + @JsonProperty("kernelUrl") + public void setKernelUrl(String kernelUrl) { + this.kernelUrl = kernelUrl; + } + + @JsonProperty("networkData") + public PreprovisioningImageStatusNetworkData getNetworkData() { + return networkData; + } + + @JsonProperty("networkData") + public void setNetworkData(PreprovisioningImageStatusNetworkData networkData) { + this.networkData = networkData; + } + + @JsonIgnore + public PreprovisioningImageStatusBuilder edit() { + return new PreprovisioningImageStatusBuilder(this); + } + + @JsonIgnore + public PreprovisioningImageStatusBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/PreprovisioningImageStatusConditions.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/PreprovisioningImageStatusConditions.java new file mode 100644 index 00000000000..503ebdba71f --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/PreprovisioningImageStatusConditions.java @@ -0,0 +1,178 @@ + +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "lastTransitionTime", + "message", + "observedGeneration", + "reason", + "status", + "type" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class PreprovisioningImageStatusConditions implements Editable , KubernetesResource +{ + + @JsonProperty("lastTransitionTime") + private String lastTransitionTime; + @JsonProperty("message") + private String message; + @JsonProperty("observedGeneration") + private Long observedGeneration; + @JsonProperty("reason") + private String reason; + @JsonProperty("status") + private String status; + @JsonProperty("type") + private String type; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public PreprovisioningImageStatusConditions() { + } + + public PreprovisioningImageStatusConditions(String lastTransitionTime, String message, Long observedGeneration, String reason, String status, 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 String getMessage() { + return message; + } + + @JsonProperty("message") + public void setMessage(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 String getReason() { + return reason; + } + + @JsonProperty("reason") + public void setReason(String reason) { + this.reason = reason; + } + + @JsonProperty("status") + public String getStatus() { + return status; + } + + @JsonProperty("status") + public void setStatus(String status) { + this.status = status; + } + + @JsonProperty("type") + public String getType() { + return type; + } + + @JsonProperty("type") + public void setType(String type) { + this.type = type; + } + + @JsonIgnore + public PreprovisioningImageStatusConditionsBuilder edit() { + return new PreprovisioningImageStatusConditionsBuilder(this); + } + + @JsonIgnore + public PreprovisioningImageStatusConditionsBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/PreprovisioningImageStatusNetworkData.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/PreprovisioningImageStatusNetworkData.java new file mode 100644 index 00000000000..12adb6171ed --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/PreprovisioningImageStatusNetworkData.java @@ -0,0 +1,122 @@ + +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "name", + "version" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class PreprovisioningImageStatusNetworkData implements Editable , KubernetesResource +{ + + @JsonProperty("name") + private String name; + @JsonProperty("version") + private String version; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public PreprovisioningImageStatusNetworkData() { + } + + public PreprovisioningImageStatusNetworkData(String name, String version) { + super(); + this.name = name; + this.version = version; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonProperty("version") + public String getVersion() { + return version; + } + + @JsonProperty("version") + public void setVersion(String version) { + this.version = version; + } + + @JsonIgnore + public PreprovisioningImageStatusNetworkDataBuilder edit() { + return new PreprovisioningImageStatusNetworkDataBuilder(this); + } + + @JsonIgnore + public PreprovisioningImageStatusNetworkDataBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/Config.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/Provisioning.java similarity index 79% rename from kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/Config.java rename to kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/Provisioning.java index aa3532a03f3..faaf0f84843 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/Config.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/Provisioning.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1; +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; import java.util.LinkedHashMap; import java.util.Map; @@ -17,6 +17,7 @@ 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.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -47,7 +48,7 @@ "" }) @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(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @@ -60,10 +61,10 @@ @TemplateTransformations({ @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) }) -@Version("v1") -@Group("imageregistry.operator.openshift.io") +@Version("v1alpha1") +@Group("metal3.io") @Generated("jsonschema2pojo") -public class Config implements Editable , HasMetadata +public class Provisioning implements Editable , HasMetadata { /** @@ -72,20 +73,20 @@ public class Config implements Editable , HasMetadata * */ @JsonProperty("apiVersion") - private String apiVersion = "imageregistry.operator.openshift.io/v1"; + private String apiVersion = "metal3.io/v1alpha1"; /** * * (Required) * */ @JsonProperty("kind") - private String kind = "Config"; + private String kind = "Provisioning"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("spec") - private ImageRegistrySpec spec; + private ProvisioningSpec spec; @JsonProperty("status") - private ImageRegistryStatus status; + private ProvisioningStatus status; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -93,10 +94,10 @@ public class Config implements Editable , HasMetadata * No args constructor for use in serialization * */ - public Config() { + public Provisioning() { } - public Config(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, ImageRegistrySpec spec, ImageRegistryStatus status) { + public Provisioning(String apiVersion, String kind, ObjectMeta metadata, ProvisioningSpec spec, ProvisioningStatus status) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -146,42 +147,42 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } @JsonProperty("spec") - public ImageRegistrySpec getSpec() { + public ProvisioningSpec getSpec() { return spec; } @JsonProperty("spec") - public void setSpec(ImageRegistrySpec spec) { + public void setSpec(ProvisioningSpec spec) { this.spec = spec; } @JsonProperty("status") - public ImageRegistryStatus getStatus() { + public ProvisioningStatus getStatus() { return status; } @JsonProperty("status") - public void setStatus(ImageRegistryStatus status) { + public void setStatus(ProvisioningStatus status) { this.status = status; } @JsonIgnore - public ConfigBuilder edit() { - return new ConfigBuilder(this); + public ProvisioningBuilder edit() { + return new ProvisioningBuilder(this); } @JsonIgnore - public ConfigBuilder toBuilder() { + public ProvisioningBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/NetNamespaceList.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/ProvisioningList.java similarity index 83% rename from kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/NetNamespaceList.java rename to kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/ProvisioningList.java index a8ff5728a52..a16612fd7c0 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/NetNamespaceList.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/ProvisioningList.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model; +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -64,10 +64,10 @@ @TemplateTransformations({ @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) }) -@Version("v1") -@Group("network.openshift.io") +@Version("v1alpha1") +@Group("metal3.io") @Generated("jsonschema2pojo") -public class NetNamespaceList implements Editable , KubernetesResource, KubernetesResourceList +public class ProvisioningList implements Editable , KubernetesResource, KubernetesResourceList { /** @@ -76,17 +76,17 @@ public class NetNamespaceList implements Editable , Kub * */ @JsonProperty("apiVersion") - private String apiVersion = "network.openshift.io/v1"; + private String apiVersion = "metal3.io/v1alpha1"; @JsonProperty("items") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List items = new ArrayList<>(); + private List items = new ArrayList<>(); /** * * (Required) * */ @JsonProperty("kind") - private String kind = "NetNamespaceList"; + private String kind = "ProvisioningList"; @JsonProperty("metadata") private ListMeta metadata; @JsonIgnore @@ -96,10 +96,10 @@ public class NetNamespaceList implements Editable , Kub * No args constructor for use in serialization * */ - public NetNamespaceList() { + public ProvisioningList() { } - public NetNamespaceList(String apiVersion, List items, String kind, ListMeta metadata) { + public ProvisioningList(String apiVersion, List items, String kind, ListMeta metadata) { super(); this.apiVersion = apiVersion; this.items = items; @@ -129,12 +129,12 @@ public void setApiVersion(String apiVersion) { @JsonProperty("items") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getItems() { + public List getItems() { return items; } @JsonProperty("items") - public void setItems(List items) { + public void setItems(List items) { this.items = items; } @@ -169,12 +169,12 @@ public void setMetadata(ListMeta metadata) { } @JsonIgnore - public NetNamespaceListBuilder edit() { - return new NetNamespaceListBuilder(this); + public ProvisioningListBuilder edit() { + return new ProvisioningListBuilder(this); } @JsonIgnore - public NetNamespaceListBuilder toBuilder() { + public ProvisioningListBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/ProvisioningSpec.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/ProvisioningSpec.java new file mode 100644 index 00000000000..0fa0646a59e --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/ProvisioningSpec.java @@ -0,0 +1,294 @@ + +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "bootIsoSource", + "disableVirtualMediaTLS", + "preProvisioningOSDownloadURLs", + "provisioningDHCPExternal", + "provisioningDHCPRange", + "provisioningDNS", + "provisioningIP", + "provisioningInterface", + "provisioningMacAddresses", + "provisioningNetwork", + "provisioningNetworkCIDR", + "provisioningOSDownloadURL", + "virtualMediaViaExternalNetwork", + "watchAllNamespaces" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class ProvisioningSpec implements Editable , KubernetesResource +{ + + @JsonProperty("bootIsoSource") + private String bootIsoSource; + @JsonProperty("disableVirtualMediaTLS") + private Boolean disableVirtualMediaTLS; + @JsonProperty("preProvisioningOSDownloadURLs") + private ProvisioningSpecPreProvisioningOSDownloadURLs preProvisioningOSDownloadURLs; + @JsonProperty("provisioningDHCPExternal") + private Boolean provisioningDHCPExternal; + @JsonProperty("provisioningDHCPRange") + private String provisioningDHCPRange; + @JsonProperty("provisioningDNS") + private Boolean provisioningDNS; + @JsonProperty("provisioningIP") + private String provisioningIP; + @JsonProperty("provisioningInterface") + private String provisioningInterface; + @JsonProperty("provisioningMacAddresses") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List provisioningMacAddresses = new ArrayList<>(); + @JsonProperty("provisioningNetwork") + private String provisioningNetwork; + @JsonProperty("provisioningNetworkCIDR") + private String provisioningNetworkCIDR; + @JsonProperty("provisioningOSDownloadURL") + private String provisioningOSDownloadURL; + @JsonProperty("virtualMediaViaExternalNetwork") + private Boolean virtualMediaViaExternalNetwork; + @JsonProperty("watchAllNamespaces") + private Boolean watchAllNamespaces; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ProvisioningSpec() { + } + + public ProvisioningSpec(String bootIsoSource, Boolean disableVirtualMediaTLS, ProvisioningSpecPreProvisioningOSDownloadURLs preProvisioningOSDownloadURLs, Boolean provisioningDHCPExternal, String provisioningDHCPRange, Boolean provisioningDNS, String provisioningIP, String provisioningInterface, List provisioningMacAddresses, String provisioningNetwork, String provisioningNetworkCIDR, String provisioningOSDownloadURL, Boolean virtualMediaViaExternalNetwork, Boolean watchAllNamespaces) { + super(); + this.bootIsoSource = bootIsoSource; + this.disableVirtualMediaTLS = disableVirtualMediaTLS; + this.preProvisioningOSDownloadURLs = preProvisioningOSDownloadURLs; + this.provisioningDHCPExternal = provisioningDHCPExternal; + this.provisioningDHCPRange = provisioningDHCPRange; + this.provisioningDNS = provisioningDNS; + this.provisioningIP = provisioningIP; + this.provisioningInterface = provisioningInterface; + this.provisioningMacAddresses = provisioningMacAddresses; + this.provisioningNetwork = provisioningNetwork; + this.provisioningNetworkCIDR = provisioningNetworkCIDR; + this.provisioningOSDownloadURL = provisioningOSDownloadURL; + this.virtualMediaViaExternalNetwork = virtualMediaViaExternalNetwork; + this.watchAllNamespaces = watchAllNamespaces; + } + + @JsonProperty("bootIsoSource") + public String getBootIsoSource() { + return bootIsoSource; + } + + @JsonProperty("bootIsoSource") + public void setBootIsoSource(String bootIsoSource) { + this.bootIsoSource = bootIsoSource; + } + + @JsonProperty("disableVirtualMediaTLS") + public Boolean getDisableVirtualMediaTLS() { + return disableVirtualMediaTLS; + } + + @JsonProperty("disableVirtualMediaTLS") + public void setDisableVirtualMediaTLS(Boolean disableVirtualMediaTLS) { + this.disableVirtualMediaTLS = disableVirtualMediaTLS; + } + + @JsonProperty("preProvisioningOSDownloadURLs") + public ProvisioningSpecPreProvisioningOSDownloadURLs getPreProvisioningOSDownloadURLs() { + return preProvisioningOSDownloadURLs; + } + + @JsonProperty("preProvisioningOSDownloadURLs") + public void setPreProvisioningOSDownloadURLs(ProvisioningSpecPreProvisioningOSDownloadURLs preProvisioningOSDownloadURLs) { + this.preProvisioningOSDownloadURLs = preProvisioningOSDownloadURLs; + } + + @JsonProperty("provisioningDHCPExternal") + public Boolean getProvisioningDHCPExternal() { + return provisioningDHCPExternal; + } + + @JsonProperty("provisioningDHCPExternal") + public void setProvisioningDHCPExternal(Boolean provisioningDHCPExternal) { + this.provisioningDHCPExternal = provisioningDHCPExternal; + } + + @JsonProperty("provisioningDHCPRange") + public String getProvisioningDHCPRange() { + return provisioningDHCPRange; + } + + @JsonProperty("provisioningDHCPRange") + public void setProvisioningDHCPRange(String provisioningDHCPRange) { + this.provisioningDHCPRange = provisioningDHCPRange; + } + + @JsonProperty("provisioningDNS") + public Boolean getProvisioningDNS() { + return provisioningDNS; + } + + @JsonProperty("provisioningDNS") + public void setProvisioningDNS(Boolean provisioningDNS) { + this.provisioningDNS = provisioningDNS; + } + + @JsonProperty("provisioningIP") + public String getProvisioningIP() { + return provisioningIP; + } + + @JsonProperty("provisioningIP") + public void setProvisioningIP(String provisioningIP) { + this.provisioningIP = provisioningIP; + } + + @JsonProperty("provisioningInterface") + public String getProvisioningInterface() { + return provisioningInterface; + } + + @JsonProperty("provisioningInterface") + public void setProvisioningInterface(String provisioningInterface) { + this.provisioningInterface = provisioningInterface; + } + + @JsonProperty("provisioningMacAddresses") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getProvisioningMacAddresses() { + return provisioningMacAddresses; + } + + @JsonProperty("provisioningMacAddresses") + public void setProvisioningMacAddresses(List provisioningMacAddresses) { + this.provisioningMacAddresses = provisioningMacAddresses; + } + + @JsonProperty("provisioningNetwork") + public String getProvisioningNetwork() { + return provisioningNetwork; + } + + @JsonProperty("provisioningNetwork") + public void setProvisioningNetwork(String provisioningNetwork) { + this.provisioningNetwork = provisioningNetwork; + } + + @JsonProperty("provisioningNetworkCIDR") + public String getProvisioningNetworkCIDR() { + return provisioningNetworkCIDR; + } + + @JsonProperty("provisioningNetworkCIDR") + public void setProvisioningNetworkCIDR(String provisioningNetworkCIDR) { + this.provisioningNetworkCIDR = provisioningNetworkCIDR; + } + + @JsonProperty("provisioningOSDownloadURL") + public String getProvisioningOSDownloadURL() { + return provisioningOSDownloadURL; + } + + @JsonProperty("provisioningOSDownloadURL") + public void setProvisioningOSDownloadURL(String provisioningOSDownloadURL) { + this.provisioningOSDownloadURL = provisioningOSDownloadURL; + } + + @JsonProperty("virtualMediaViaExternalNetwork") + public Boolean getVirtualMediaViaExternalNetwork() { + return virtualMediaViaExternalNetwork; + } + + @JsonProperty("virtualMediaViaExternalNetwork") + public void setVirtualMediaViaExternalNetwork(Boolean virtualMediaViaExternalNetwork) { + this.virtualMediaViaExternalNetwork = virtualMediaViaExternalNetwork; + } + + @JsonProperty("watchAllNamespaces") + public Boolean getWatchAllNamespaces() { + return watchAllNamespaces; + } + + @JsonProperty("watchAllNamespaces") + public void setWatchAllNamespaces(Boolean watchAllNamespaces) { + this.watchAllNamespaces = watchAllNamespaces; + } + + @JsonIgnore + public ProvisioningSpecBuilder edit() { + return new ProvisioningSpecBuilder(this); + } + + @JsonIgnore + public ProvisioningSpecBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/ProvisioningSpecPreProvisioningOSDownloadURLs.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/ProvisioningSpecPreProvisioningOSDownloadURLs.java new file mode 100644 index 00000000000..6d766a65d6e --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/ProvisioningSpecPreProvisioningOSDownloadURLs.java @@ -0,0 +1,150 @@ + +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "initramfsURL", + "isoURL", + "kernelURL", + "rootfsURL" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class ProvisioningSpecPreProvisioningOSDownloadURLs implements Editable , KubernetesResource +{ + + @JsonProperty("initramfsURL") + private String initramfsURL; + @JsonProperty("isoURL") + private String isoURL; + @JsonProperty("kernelURL") + private String kernelURL; + @JsonProperty("rootfsURL") + private String rootfsURL; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ProvisioningSpecPreProvisioningOSDownloadURLs() { + } + + public ProvisioningSpecPreProvisioningOSDownloadURLs(String initramfsURL, String isoURL, String kernelURL, String rootfsURL) { + super(); + this.initramfsURL = initramfsURL; + this.isoURL = isoURL; + this.kernelURL = kernelURL; + this.rootfsURL = rootfsURL; + } + + @JsonProperty("initramfsURL") + public String getInitramfsURL() { + return initramfsURL; + } + + @JsonProperty("initramfsURL") + public void setInitramfsURL(String initramfsURL) { + this.initramfsURL = initramfsURL; + } + + @JsonProperty("isoURL") + public String getIsoURL() { + return isoURL; + } + + @JsonProperty("isoURL") + public void setIsoURL(String isoURL) { + this.isoURL = isoURL; + } + + @JsonProperty("kernelURL") + public String getKernelURL() { + return kernelURL; + } + + @JsonProperty("kernelURL") + public void setKernelURL(String kernelURL) { + this.kernelURL = kernelURL; + } + + @JsonProperty("rootfsURL") + public String getRootfsURL() { + return rootfsURL; + } + + @JsonProperty("rootfsURL") + public void setRootfsURL(String rootfsURL) { + this.rootfsURL = rootfsURL; + } + + @JsonIgnore + public ProvisioningSpecPreProvisioningOSDownloadURLsBuilder edit() { + return new ProvisioningSpecPreProvisioningOSDownloadURLsBuilder(this); + } + + @JsonIgnore + public ProvisioningSpecPreProvisioningOSDownloadURLsBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryStatus.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/ProvisioningStatus.java similarity index 70% rename from kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryStatus.java rename to kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/ProvisioningStatus.java index 54f1e9e3723..3031a41729c 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryStatus.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/ProvisioningStatus.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1; +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -24,8 +24,6 @@ import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.fabric8.openshift.api.model.operator.v1.AuthenticationStatusConditions; -import io.fabric8.openshift.api.model.operator.v1.AuthenticationStatusGenerations; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; import lombok.EqualsAndHashCode; @@ -39,8 +37,6 @@ "generations", "observedGeneration", "readyReplicas", - "storage", - "storageManaged", "version" }) @ToString @@ -61,23 +57,19 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ImageRegistryStatus implements Editable , KubernetesResource +public class ProvisioningStatus implements Editable , KubernetesResource { @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List conditions = new ArrayList<>(); + private List conditions = new ArrayList<>(); @JsonProperty("generations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List generations = new ArrayList<>(); + private List generations = new ArrayList<>(); @JsonProperty("observedGeneration") private Long observedGeneration; @JsonProperty("readyReplicas") private Integer readyReplicas; - @JsonProperty("storage") - private ImageRegistryConfigStorage storage; - @JsonProperty("storageManaged") - private Boolean storageManaged; @JsonProperty("version") private String version; @JsonIgnore @@ -87,39 +79,37 @@ public class ImageRegistryStatus implements Editable * No args constructor for use in serialization * */ - public ImageRegistryStatus() { + public ProvisioningStatus() { } - public ImageRegistryStatus(List conditions, List generations, Long observedGeneration, Integer readyReplicas, ImageRegistryConfigStorage storage, Boolean storageManaged, String version) { + public ProvisioningStatus(List conditions, List generations, Long observedGeneration, Integer readyReplicas, String version) { super(); this.conditions = conditions; this.generations = generations; this.observedGeneration = observedGeneration; this.readyReplicas = readyReplicas; - this.storage = storage; - this.storageManaged = storageManaged; this.version = version; } @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getConditions() { + public List getConditions() { return conditions; } @JsonProperty("conditions") - public void setConditions(List conditions) { + public void setConditions(List conditions) { this.conditions = conditions; } @JsonProperty("generations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getGenerations() { + public List getGenerations() { return generations; } @JsonProperty("generations") - public void setGenerations(List generations) { + public void setGenerations(List generations) { this.generations = generations; } @@ -143,26 +133,6 @@ public void setReadyReplicas(Integer readyReplicas) { this.readyReplicas = readyReplicas; } - @JsonProperty("storage") - public ImageRegistryConfigStorage getStorage() { - return storage; - } - - @JsonProperty("storage") - public void setStorage(ImageRegistryConfigStorage storage) { - this.storage = storage; - } - - @JsonProperty("storageManaged") - public Boolean getStorageManaged() { - return storageManaged; - } - - @JsonProperty("storageManaged") - public void setStorageManaged(Boolean storageManaged) { - this.storageManaged = storageManaged; - } - @JsonProperty("version") public String getVersion() { return version; @@ -174,12 +144,12 @@ public void setVersion(String version) { } @JsonIgnore - public ImageRegistryStatusBuilder edit() { - return new ImageRegistryStatusBuilder(this); + public ProvisioningStatusBuilder edit() { + return new ProvisioningStatusBuilder(this); } @JsonIgnore - public ImageRegistryStatusBuilder toBuilder() { + public ProvisioningStatusBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/EgressRouterStatusCondition.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/ProvisioningStatusConditions.java similarity index 89% rename from kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/EgressRouterStatusCondition.java rename to kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/ProvisioningStatusConditions.java index ac9ce87c568..4075fc58f53 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/EgressRouterStatusCondition.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/ProvisioningStatusConditions.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.miscellaneous.network.operator.v1; +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; import java.util.LinkedHashMap; import java.util.Map; @@ -55,7 +55,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class EgressRouterStatusCondition implements Editable , KubernetesResource +public class ProvisioningStatusConditions implements Editable , KubernetesResource { @JsonProperty("lastTransitionTime") @@ -75,10 +75,10 @@ public class EgressRouterStatusCondition implements Editable , KubernetesResource +public class ProvisioningStatusGenerations implements Editable , KubernetesResource { - @JsonProperty("hostname") - private String hostname; + @JsonProperty("group") + private String group; + @JsonProperty("hash") + private String hash; + @JsonProperty("lastGeneration") + private Long lastGeneration; @JsonProperty("name") private String name; - @JsonProperty("secretName") - private String secretName; + @JsonProperty("namespace") + private String namespace; + @JsonProperty("resource") + private String resource; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -69,24 +78,47 @@ public class ImageRegistryConfigRoute implements Editable , H @JsonProperty("kind") private String kind = "Metal3Remediation"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("spec") private Metal3RemediationSpec spec; @JsonProperty("status") @@ -97,7 +98,7 @@ public class Metal3Remediation implements Editable , H public Metal3Remediation() { } - public Metal3Remediation(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, Metal3RemediationSpec spec, Metal3RemediationStatus status) { + public Metal3Remediation(String apiVersion, String kind, ObjectMeta metadata, Metal3RemediationSpec spec, Metal3RemediationStatus status) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -147,12 +148,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1beta1/Metal3RemediationSpec.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1beta1/Metal3RemediationSpec.java index 1a3b752f021..69d2f5d66b5 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1beta1/Metal3RemediationSpec.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1beta1/Metal3RemediationSpec.java @@ -55,7 +55,7 @@ public class Metal3RemediationSpec implements Editable additionalProperties = new LinkedHashMap(); @@ -66,18 +66,18 @@ public class Metal3RemediationSpec implements Editable , KubernetesResource +public class Metal3RemediationSpecStrategy implements Editable , KubernetesResource { @JsonProperty("retryLimit") private Integer retryLimit; @JsonProperty("timeout") - private Duration timeout; + private String timeout; @JsonProperty("type") private String type; @JsonIgnore @@ -70,10 +69,10 @@ public class RemediationStrategy implements Editable * No args constructor for use in serialization * */ - public RemediationStrategy() { + public Metal3RemediationSpecStrategy() { } - public RemediationStrategy(Integer retryLimit, Duration timeout, String type) { + public Metal3RemediationSpecStrategy(Integer retryLimit, String timeout, String type) { super(); this.retryLimit = retryLimit; this.timeout = timeout; @@ -91,12 +90,12 @@ public void setRetryLimit(Integer retryLimit) { } @JsonProperty("timeout") - public Duration getTimeout() { + public String getTimeout() { return timeout; } @JsonProperty("timeout") - public void setTimeout(Duration timeout) { + public void setTimeout(String timeout) { this.timeout = timeout; } @@ -111,12 +110,12 @@ public void setType(String type) { } @JsonIgnore - public RemediationStrategyBuilder edit() { - return new RemediationStrategyBuilder(this); + public Metal3RemediationSpecStrategyBuilder edit() { + return new Metal3RemediationSpecStrategyBuilder(this); } @JsonIgnore - public RemediationStrategyBuilder toBuilder() { + public Metal3RemediationSpecStrategyBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1beta1/Metal3RemediationTemplate.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1beta1/Metal3RemediationTemplate.java index f06c27c0fd0..19f563f1172 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1beta1/Metal3RemediationTemplate.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1beta1/Metal3RemediationTemplate.java @@ -18,6 +18,7 @@ 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.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -48,7 +49,7 @@ "" }) @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(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @@ -82,7 +83,7 @@ public class Metal3RemediationTemplate implements Editable additionalProperties = new LinkedHashMap(); @@ -66,18 +66,18 @@ public class Metal3RemediationTemplateSpec implements Editable , KubernetesResource +public class Metal3RemediationTemplateSpecTSpec implements Editable , KubernetesResource { - @JsonProperty("gateway") - private String gateway; - @JsonProperty("ip") - private String ip; + @JsonProperty("strategy") + private Metal3RemediationTemplateSpecTSpecStrategy strategy; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -66,42 +63,31 @@ public class EgressRouterAddress implements Editable * No args constructor for use in serialization * */ - public EgressRouterAddress() { + public Metal3RemediationTemplateSpecTSpec() { } - public EgressRouterAddress(String gateway, String ip) { + public Metal3RemediationTemplateSpecTSpec(Metal3RemediationTemplateSpecTSpecStrategy strategy) { super(); - this.gateway = gateway; - this.ip = ip; + this.strategy = strategy; } - @JsonProperty("gateway") - public String getGateway() { - return gateway; + @JsonProperty("strategy") + public Metal3RemediationTemplateSpecTSpecStrategy getStrategy() { + return strategy; } - @JsonProperty("gateway") - public void setGateway(String gateway) { - this.gateway = gateway; - } - - @JsonProperty("ip") - public String getIp() { - return ip; - } - - @JsonProperty("ip") - public void setIp(String ip) { - this.ip = ip; + @JsonProperty("strategy") + public void setStrategy(Metal3RemediationTemplateSpecTSpecStrategy strategy) { + this.strategy = strategy; } @JsonIgnore - public EgressRouterAddressBuilder edit() { - return new EgressRouterAddressBuilder(this); + public Metal3RemediationTemplateSpecTSpecBuilder edit() { + return new Metal3RemediationTemplateSpecTSpecBuilder(this); } @JsonIgnore - public EgressRouterAddressBuilder toBuilder() { + public Metal3RemediationTemplateSpecTSpecBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1beta1/Metal3RemediationTemplateSpecTSpecStrategy.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1beta1/Metal3RemediationTemplateSpecTSpecStrategy.java new file mode 100644 index 00000000000..0b0df7ed3af --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1beta1/Metal3RemediationTemplateSpecTSpecStrategy.java @@ -0,0 +1,136 @@ + +package io.fabric8.openshift.api.model.miscellaneous.metal3.v1beta1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "retryLimit", + "timeout", + "type" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class Metal3RemediationTemplateSpecTSpecStrategy implements Editable , KubernetesResource +{ + + @JsonProperty("retryLimit") + private Integer retryLimit; + @JsonProperty("timeout") + private String timeout; + @JsonProperty("type") + private String type; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public Metal3RemediationTemplateSpecTSpecStrategy() { + } + + public Metal3RemediationTemplateSpecTSpecStrategy(Integer retryLimit, String timeout, String type) { + super(); + this.retryLimit = retryLimit; + this.timeout = timeout; + this.type = type; + } + + @JsonProperty("retryLimit") + public Integer getRetryLimit() { + return retryLimit; + } + + @JsonProperty("retryLimit") + public void setRetryLimit(Integer retryLimit) { + this.retryLimit = retryLimit; + } + + @JsonProperty("timeout") + public String getTimeout() { + return timeout; + } + + @JsonProperty("timeout") + public void setTimeout(String timeout) { + this.timeout = timeout; + } + + @JsonProperty("type") + public String getType() { + return type; + } + + @JsonProperty("type") + public void setType(String type) { + this.type = type; + } + + @JsonIgnore + public Metal3RemediationTemplateSpecTSpecStrategyBuilder edit() { + return new Metal3RemediationTemplateSpecTSpecStrategyBuilder(this); + } + + @JsonIgnore + public Metal3RemediationTemplateSpecTSpecStrategyBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1beta1/Metal3RemediationTemplateResource.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1beta1/Metal3RemediationTemplateSpecTemplate.java similarity index 82% rename from kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1beta1/Metal3RemediationTemplateResource.java rename to kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1beta1/Metal3RemediationTemplateSpecTemplate.java index 9fb4b12a5de..6267d5e7d41 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1beta1/Metal3RemediationTemplateResource.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1beta1/Metal3RemediationTemplateSpecTemplate.java @@ -51,11 +51,11 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class Metal3RemediationTemplateResource implements Editable , KubernetesResource +public class Metal3RemediationTemplateSpecTemplate implements Editable , KubernetesResource { @JsonProperty("spec") - private Metal3RemediationSpec spec; + private Metal3RemediationTemplateSpecTSpec spec; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -63,31 +63,31 @@ public class Metal3RemediationTemplateResource implements Editable additionalProperties = new LinkedHashMap(); @@ -66,18 +66,18 @@ public class Metal3RemediationTemplateStatus implements Editable , KubernetesResource +public class Metal3RemediationTemplateStatusStatus implements Editable , KubernetesResource { - @JsonProperty("accountName") - private String accountName; - @JsonProperty("cloudName") - private String cloudName; - @JsonProperty("container") - private String container; + @JsonProperty("lastRemediated") + private String lastRemediated; + @JsonProperty("phase") + private String phase; + @JsonProperty("retryCount") + private Integer retryCount; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -69,53 +69,53 @@ public class ImageRegistryConfigStorageAzure implements Editable , HasMetadata +{ + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + private String apiVersion = "cloud.network.openshift.io/v1"; + /** + * + * (Required) + * + */ + @JsonProperty("kind") + private String kind = "CloudPrivateIPConfig"; + @JsonProperty("metadata") + private ObjectMeta metadata; + @JsonProperty("spec") + private CloudPrivateIPConfigSpec spec; + @JsonProperty("status") + private CloudPrivateIPConfigStatus status; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public CloudPrivateIPConfig() { + } + + public CloudPrivateIPConfig(String apiVersion, String kind, ObjectMeta metadata, CloudPrivateIPConfigSpec spec, CloudPrivateIPConfigStatus 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 ObjectMeta getMetadata() { + return metadata; + } + + @JsonProperty("metadata") + public void setMetadata(ObjectMeta metadata) { + this.metadata = metadata; + } + + @JsonProperty("spec") + public CloudPrivateIPConfigSpec getSpec() { + return spec; + } + + @JsonProperty("spec") + public void setSpec(CloudPrivateIPConfigSpec spec) { + this.spec = spec; + } + + @JsonProperty("status") + public CloudPrivateIPConfigStatus getStatus() { + return status; + } + + @JsonProperty("status") + public void setStatus(CloudPrivateIPConfigStatus status) { + this.status = status; + } + + @JsonIgnore + public CloudPrivateIPConfigBuilder edit() { + return new CloudPrivateIPConfigBuilder(this); + } + + @JsonIgnore + public CloudPrivateIPConfigBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/OperatorPKIList.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/cloud/v1/CloudPrivateIPConfigList.java similarity index 83% rename from kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/OperatorPKIList.java rename to kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/cloud/v1/CloudPrivateIPConfigList.java index d9318f33daa..08a95e9625d 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/OperatorPKIList.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/cloud/v1/CloudPrivateIPConfigList.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.miscellaneous.network.operator.v1; +package io.fabric8.openshift.api.model.miscellaneous.network.cloud.v1; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -65,9 +65,9 @@ @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) }) @Version("v1") -@Group("network.operator.openshift.io") +@Group("cloud.network.openshift.io") @Generated("jsonschema2pojo") -public class OperatorPKIList implements Editable , KubernetesResource, KubernetesResourceList +public class CloudPrivateIPConfigList implements Editable , KubernetesResource, KubernetesResourceList { /** @@ -76,17 +76,17 @@ public class OperatorPKIList implements Editable , Kuber * */ @JsonProperty("apiVersion") - private String apiVersion = "network.operator.openshift.io/v1"; + private String apiVersion = "cloud.network.openshift.io/v1"; @JsonProperty("items") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List items = new ArrayList<>(); + private List items = new ArrayList<>(); /** * * (Required) * */ @JsonProperty("kind") - private String kind = "OperatorPKIList"; + private String kind = "CloudPrivateIPConfigList"; @JsonProperty("metadata") private ListMeta metadata; @JsonIgnore @@ -96,10 +96,10 @@ public class OperatorPKIList implements Editable , Kuber * No args constructor for use in serialization * */ - public OperatorPKIList() { + public CloudPrivateIPConfigList() { } - public OperatorPKIList(String apiVersion, List items, String kind, ListMeta metadata) { + public CloudPrivateIPConfigList(String apiVersion, List items, String kind, ListMeta metadata) { super(); this.apiVersion = apiVersion; this.items = items; @@ -129,12 +129,12 @@ public void setApiVersion(String apiVersion) { @JsonProperty("items") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getItems() { + public List getItems() { return items; } @JsonProperty("items") - public void setItems(List items) { + public void setItems(List items) { this.items = items; } @@ -169,12 +169,12 @@ public void setMetadata(ListMeta metadata) { } @JsonIgnore - public OperatorPKIListBuilder edit() { - return new OperatorPKIListBuilder(this); + public CloudPrivateIPConfigListBuilder edit() { + return new CloudPrivateIPConfigListBuilder(this); } @JsonIgnore - public OperatorPKIListBuilder toBuilder() { + public CloudPrivateIPConfigListBuilder toBuilder() { return edit(); } 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/network/cloud/v1/CloudPrivateIPConfigSpec.java similarity index 80% rename from kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/KMSEncryptionAlibaba.java rename to kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/cloud/v1/CloudPrivateIPConfigSpec.java index 94928a299a6..8d755e39bf1 100644 --- 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/network/cloud/v1/CloudPrivateIPConfigSpec.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1; +package io.fabric8.openshift.api.model.miscellaneous.network.cloud.v1; import java.util.LinkedHashMap; import java.util.Map; @@ -31,7 +31,7 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "keyID" + "node" }) @ToString @EqualsAndHashCode @@ -51,11 +51,11 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class KMSEncryptionAlibaba implements Editable , KubernetesResource +public class CloudPrivateIPConfigSpec implements Editable , KubernetesResource { - @JsonProperty("keyID") - private String keyID; + @JsonProperty("node") + private String node; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -63,31 +63,31 @@ public class KMSEncryptionAlibaba implements Editable , KubernetesResource +{ + + @JsonProperty("conditions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List conditions = new ArrayList<>(); + @JsonProperty("node") + private String node; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public CloudPrivateIPConfigStatus() { + } + + public CloudPrivateIPConfigStatus(List conditions, String node) { + super(); + this.conditions = conditions; + this.node = node; + } + + @JsonProperty("conditions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getConditions() { + return conditions; + } + + @JsonProperty("conditions") + public void setConditions(List conditions) { + this.conditions = conditions; + } + + @JsonProperty("node") + public String getNode() { + return node; + } + + @JsonProperty("node") + public void setNode(String node) { + this.node = node; + } + + @JsonIgnore + public CloudPrivateIPConfigStatusBuilder edit() { + return new CloudPrivateIPConfigStatusBuilder(this); + } + + @JsonIgnore + public CloudPrivateIPConfigStatusBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/cloud/v1/CloudPrivateIPConfigStatusConditions.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/cloud/v1/CloudPrivateIPConfigStatusConditions.java new file mode 100644 index 00000000000..99d1cfc46f1 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/cloud/v1/CloudPrivateIPConfigStatusConditions.java @@ -0,0 +1,178 @@ + +package io.fabric8.openshift.api.model.miscellaneous.network.cloud.v1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "lastTransitionTime", + "message", + "observedGeneration", + "reason", + "status", + "type" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class CloudPrivateIPConfigStatusConditions implements Editable , KubernetesResource +{ + + @JsonProperty("lastTransitionTime") + private String lastTransitionTime; + @JsonProperty("message") + private String message; + @JsonProperty("observedGeneration") + private Long observedGeneration; + @JsonProperty("reason") + private String reason; + @JsonProperty("status") + private String status; + @JsonProperty("type") + private String type; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public CloudPrivateIPConfigStatusConditions() { + } + + public CloudPrivateIPConfigStatusConditions(String lastTransitionTime, String message, Long observedGeneration, String reason, String status, 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 String getMessage() { + return message; + } + + @JsonProperty("message") + public void setMessage(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 String getReason() { + return reason; + } + + @JsonProperty("reason") + public void setReason(String reason) { + this.reason = reason; + } + + @JsonProperty("status") + public String getStatus() { + return status; + } + + @JsonProperty("status") + public void setStatus(String status) { + this.status = status; + } + + @JsonProperty("type") + public String getType() { + return type; + } + + @JsonProperty("type") + public void setType(String type) { + this.type = type; + } + + @JsonIgnore + public CloudPrivateIPConfigStatusConditionsBuilder edit() { + return new CloudPrivateIPConfigStatusConditionsBuilder(this); + } + + @JsonIgnore + public CloudPrivateIPConfigStatusConditionsBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/EgressRouterInterface.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/EgressRouterInterface.java deleted file mode 100644 index 26319f8e07d..00000000000 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/EgressRouterInterface.java +++ /dev/null @@ -1,108 +0,0 @@ - -package io.fabric8.openshift.api.model.miscellaneous.network.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -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.builder.Editable; -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.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "macvlan" -}) -@ToString -@EqualsAndHashCode -@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) -}) -@Generated("jsonschema2pojo") -public class EgressRouterInterface implements Editable , KubernetesResource -{ - - @JsonProperty("macvlan") - private MacvlanConfig macvlan; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public EgressRouterInterface() { - } - - public EgressRouterInterface(MacvlanConfig macvlan) { - super(); - this.macvlan = macvlan; - } - - @JsonProperty("macvlan") - public MacvlanConfig getMacvlan() { - return macvlan; - } - - @JsonProperty("macvlan") - public void setMacvlan(MacvlanConfig macvlan) { - this.macvlan = macvlan; - } - - @JsonIgnore - public EgressRouterInterfaceBuilder edit() { - return new EgressRouterInterfaceBuilder(this); - } - - @JsonIgnore - public EgressRouterInterfaceBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/EgressRouterSpec.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/EgressRouterSpec.java deleted file mode 100644 index c0b6fd8d6ba..00000000000 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/EgressRouterSpec.java +++ /dev/null @@ -1,154 +0,0 @@ - -package io.fabric8.openshift.api.model.miscellaneous.network.operator.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -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.builder.Editable; -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.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "addresses", - "mode", - "networkInterface", - "redirect" -}) -@ToString -@EqualsAndHashCode -@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) -}) -@Generated("jsonschema2pojo") -public class EgressRouterSpec implements Editable , KubernetesResource -{ - - @JsonProperty("addresses") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List addresses = new ArrayList<>(); - @JsonProperty("mode") - private String mode; - @JsonProperty("networkInterface") - private EgressRouterInterface networkInterface; - @JsonProperty("redirect") - private RedirectConfig redirect; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public EgressRouterSpec() { - } - - public EgressRouterSpec(List addresses, String mode, EgressRouterInterface networkInterface, RedirectConfig redirect) { - super(); - this.addresses = addresses; - this.mode = mode; - this.networkInterface = networkInterface; - this.redirect = redirect; - } - - @JsonProperty("addresses") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getAddresses() { - return addresses; - } - - @JsonProperty("addresses") - public void setAddresses(List addresses) { - this.addresses = addresses; - } - - @JsonProperty("mode") - public String getMode() { - return mode; - } - - @JsonProperty("mode") - public void setMode(String mode) { - this.mode = mode; - } - - @JsonProperty("networkInterface") - public EgressRouterInterface getNetworkInterface() { - return networkInterface; - } - - @JsonProperty("networkInterface") - public void setNetworkInterface(EgressRouterInterface networkInterface) { - this.networkInterface = networkInterface; - } - - @JsonProperty("redirect") - public RedirectConfig getRedirect() { - return redirect; - } - - @JsonProperty("redirect") - public void setRedirect(RedirectConfig redirect) { - this.redirect = redirect; - } - - @JsonIgnore - public EgressRouterSpecBuilder edit() { - return new EgressRouterSpecBuilder(this); - } - - @JsonIgnore - public EgressRouterSpecBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/L4RedirectRule.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/L4RedirectRule.java deleted file mode 100644 index 75e1ea03cf4..00000000000 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/L4RedirectRule.java +++ /dev/null @@ -1,150 +0,0 @@ - -package io.fabric8.openshift.api.model.miscellaneous.network.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -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.builder.Editable; -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.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "destinationIP", - "port", - "protocol", - "targetPort" -}) -@ToString -@EqualsAndHashCode -@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) -}) -@Generated("jsonschema2pojo") -public class L4RedirectRule implements Editable , KubernetesResource -{ - - @JsonProperty("destinationIP") - private String destinationIP; - @JsonProperty("port") - private Integer port; - @JsonProperty("protocol") - private String protocol; - @JsonProperty("targetPort") - private Integer targetPort; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public L4RedirectRule() { - } - - public L4RedirectRule(String destinationIP, Integer port, String protocol, Integer targetPort) { - super(); - this.destinationIP = destinationIP; - this.port = port; - this.protocol = protocol; - this.targetPort = targetPort; - } - - @JsonProperty("destinationIP") - public String getDestinationIP() { - return destinationIP; - } - - @JsonProperty("destinationIP") - public void setDestinationIP(String destinationIP) { - this.destinationIP = destinationIP; - } - - @JsonProperty("port") - public Integer getPort() { - return port; - } - - @JsonProperty("port") - public void setPort(Integer port) { - this.port = port; - } - - @JsonProperty("protocol") - public String getProtocol() { - return protocol; - } - - @JsonProperty("protocol") - public void setProtocol(String protocol) { - this.protocol = protocol; - } - - @JsonProperty("targetPort") - public Integer getTargetPort() { - return targetPort; - } - - @JsonProperty("targetPort") - public void setTargetPort(Integer targetPort) { - this.targetPort = targetPort; - } - - @JsonIgnore - public L4RedirectRuleBuilder edit() { - return new L4RedirectRuleBuilder(this); - } - - @JsonIgnore - public L4RedirectRuleBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/OperatorPKIStatus.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/OperatorPKIStatus.java deleted file mode 100644 index e48f4770f57..00000000000 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/OperatorPKIStatus.java +++ /dev/null @@ -1,83 +0,0 @@ - -package io.fabric8.openshift.api.model.miscellaneous.network.operator.v1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -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.builder.Editable; -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.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - -}) -@ToString -@EqualsAndHashCode -@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) -}) -@Generated("jsonschema2pojo") -public class OperatorPKIStatus implements Editable , KubernetesResource -{ - - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - @JsonIgnore - public OperatorPKIStatusBuilder edit() { - return new OperatorPKIStatusBuilder(this); - } - - @JsonIgnore - public OperatorPKIStatusBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/test/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/APIRequestCountTest.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/test/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/APIRequestCountTest.java index a0e327754ae..13e6da9cd97 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/test/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/APIRequestCountTest.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/test/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/APIRequestCountTest.java @@ -16,10 +16,10 @@ package io.fabric8.openshift.api.model.miscellaneous.apiserver.v1; import com.fasterxml.jackson.databind.ObjectMapper; +import io.fabric8.kubernetes.model.util.Helper; import org.junit.jupiter.api.Test; import java.io.IOException; -import java.util.Scanner; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -30,9 +30,7 @@ class APIRequestCountTest { @Test void deserializationAndSerializationShouldWorkAsExpected() throws IOException { // Given - String originalJson = new Scanner(getClass().getResourceAsStream("/valid-apirequestcount.json")) - .useDelimiter("\\A") - .next(); + String originalJson = Helper.loadJson("/valid-apirequestcount.json"); // When final APIRequestCount apiRequestCount = mapper.readValue(originalJson, APIRequestCount.class); diff --git a/kubernetes-model-generator/openshift-model/src/test/java/io/fabric8/openshift/api/model/ProjectHelmChartRepositoryTest.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/test/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1/ProjectHelmChartRepositoryTest.java similarity index 92% rename from kubernetes-model-generator/openshift-model/src/test/java/io/fabric8/openshift/api/model/ProjectHelmChartRepositoryTest.java rename to kubernetes-model-generator/openshift-model-miscellaneous/src/test/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1/ProjectHelmChartRepositoryTest.java index 4caf7c69f07..b91a8a1caa2 100644 --- a/kubernetes-model-generator/openshift-model/src/test/java/io/fabric8/openshift/api/model/ProjectHelmChartRepositoryTest.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/test/java/io/fabric8/openshift/api/model/miscellaneous/helm/v1beta1/ProjectHelmChartRepositoryTest.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.fabric8.openshift.api.model; +package io.fabric8.openshift.api.model.miscellaneous.helm.v1beta1; import com.fasterxml.jackson.databind.ObjectMapper; import io.fabric8.kubernetes.api.model.Namespaced; +import io.fabric8.kubernetes.model.util.Helper; import org.junit.jupiter.api.Test; import java.io.IOException; -import java.util.Scanner; import static org.assertj.core.api.Assertions.assertThat; @@ -35,9 +35,7 @@ void isNamespaceScoped() { @Test void deserializationAndSerializationShouldWorkAsExpected() throws IOException { // Given - String originalJson = new Scanner(getClass().getResourceAsStream("/test-v1beta1-projecthelmchartrepository.json")) - .useDelimiter("\\A") - .next(); + String originalJson = Helper.loadJson("/test-v1beta1-projecthelmchartrepository.json"); // When final ProjectHelmChartRepository projectHelmChartRepository = mapper.readValue(originalJson, diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/test/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1beta1/Metal3RemediationTemplateTest.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/test/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1beta1/Metal3RemediationTemplateTest.java index a597d32ff32..a0f39301c3e 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/test/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1beta1/Metal3RemediationTemplateTest.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/test/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1beta1/Metal3RemediationTemplateTest.java @@ -16,13 +16,12 @@ package io.fabric8.openshift.api.model.miscellaneous.metal3.v1beta1; import com.fasterxml.jackson.databind.ObjectMapper; -import io.fabric8.kubernetes.api.model.Duration; import io.fabric8.kubernetes.api.model.Namespaced; +import io.fabric8.kubernetes.model.util.Helper; import org.junit.jupiter.api.Test; import java.io.IOException; import java.text.ParseException; -import java.util.Scanner; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; @@ -37,9 +36,7 @@ void isNamespaceScoped() { @Test void deserializationAndSerializationShouldWorkAsExpected() throws IOException, ParseException { // Given - String originalJson = new Scanner(getClass().getResourceAsStream("/test-v1beta1-metal3remediationtemplate.json")) - .useDelimiter("\\A") - .next(); + String originalJson = Helper.loadJson("/test-v1beta1-metal3remediationtemplate.json"); // When final Metal3RemediationTemplate metal3RemediationTemplate = mapper.readValue(originalJson, Metal3RemediationTemplate.class); @@ -51,9 +48,9 @@ void deserializationAndSerializationShouldWorkAsExpected() throws IOException, P .hasFieldOrPropertyWithValue("metadata.name", "test-remediation-template") .extracting(Metal3RemediationTemplate::getSpec) .extracting(Metal3RemediationTemplateSpec::getTemplate) - .extracting(Metal3RemediationTemplateResource::getSpec) + .extracting(Metal3RemediationTemplateSpecTemplate::getSpec) .hasFieldOrPropertyWithValue("strategy.retryLimit", 1) - .hasFieldOrPropertyWithValue("strategy.timeout", Duration.parse("5m0s")) + .hasFieldOrPropertyWithValue("strategy.timeout", "5m0s") .hasFieldOrPropertyWithValue("strategy.type", "Reboot"); } @@ -68,7 +65,7 @@ void builder() throws ParseException { .withNewTemplate() .withNewSpec() .withNewStrategy() - .withTimeout(Duration.parse("5s")) + .withTimeout("5s") .withRetryLimit(5) .withType("Done") .endStrategy() @@ -84,9 +81,9 @@ void builder() throws ParseException { .hasFieldOrPropertyWithValue("metadata.name", "test-remediation-template") .extracting(Metal3RemediationTemplate::getSpec) .extracting(Metal3RemediationTemplateSpec::getTemplate) - .extracting(Metal3RemediationTemplateResource::getSpec) + .extracting(Metal3RemediationTemplateSpecTemplate::getSpec) .hasFieldOrPropertyWithValue("strategy.retryLimit", 5) - .hasFieldOrPropertyWithValue("strategy.timeout", Duration.parse("5s")) + .hasFieldOrPropertyWithValue("strategy.timeout", "5s") .hasFieldOrPropertyWithValue("strategy.type", "Done"); } } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/test/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1beta1/Metal3RemediationTest.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/test/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1beta1/Metal3RemediationTest.java index 260faf0a4e3..b3fafa769e4 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/test/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1beta1/Metal3RemediationTest.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/test/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1beta1/Metal3RemediationTest.java @@ -16,13 +16,12 @@ package io.fabric8.openshift.api.model.miscellaneous.metal3.v1beta1; import com.fasterxml.jackson.databind.ObjectMapper; -import io.fabric8.kubernetes.api.model.Duration; import io.fabric8.kubernetes.api.model.Namespaced; +import io.fabric8.kubernetes.model.util.Helper; import org.junit.jupiter.api.Test; import java.io.IOException; import java.text.ParseException; -import java.util.Scanner; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; @@ -37,9 +36,7 @@ void isNamespaceScoped() { @Test void deserializationAndSerializationShouldWorkAsExpected() throws IOException, ParseException { // Given - String originalJson = new Scanner(getClass().getResourceAsStream("/test-v1beta1-metal3remediation.json")) - .useDelimiter("\\A") - .next(); + String originalJson = Helper.loadJson("/test-v1beta1-metal3remediation.json"); // When final Metal3Remediation metal3Remediation = mapper.readValue(originalJson, Metal3Remediation.class); @@ -51,7 +48,7 @@ void deserializationAndSerializationShouldWorkAsExpected() throws IOException, P .hasFieldOrPropertyWithValue("metadata.name", "test-remediation") .extracting(Metal3Remediation::getSpec) .hasFieldOrPropertyWithValue("strategy.retryLimit", 1) - .hasFieldOrPropertyWithValue("strategy.timeout", Duration.parse("5m0s")) + .hasFieldOrPropertyWithValue("strategy.timeout", "5m0s") .hasFieldOrPropertyWithValue("strategy.type", "Reboot"); } @@ -64,7 +61,7 @@ void builder() throws ParseException { .endMetadata() .withNewSpec() .withNewStrategy() - .withTimeout(Duration.parse("5s")) + .withTimeout("5s") .withRetryLimit(5) .withType("Done") .endStrategy() @@ -78,7 +75,7 @@ void builder() throws ParseException { .hasFieldOrPropertyWithValue("metadata.name", "test-remediation") .extracting(Metal3Remediation::getSpec) .hasFieldOrPropertyWithValue("strategy.retryLimit", 5) - .hasFieldOrPropertyWithValue("strategy.timeout", Duration.parse("5s")) + .hasFieldOrPropertyWithValue("strategy.timeout", "5s") .hasFieldOrPropertyWithValue("strategy.type", "Done"); } } diff --git a/kubernetes-model-generator/openshift-model/src/test/resources/test-v1beta1-projecthelmchartrepository.json b/kubernetes-model-generator/openshift-model-miscellaneous/src/test/resources/test-v1beta1-projecthelmchartrepository.json similarity index 100% rename from kubernetes-model-generator/openshift-model/src/test/resources/test-v1beta1-projecthelmchartrepository.json rename to kubernetes-model-generator/openshift-model-miscellaneous/src/test/resources/test-v1beta1-projecthelmchartrepository.json diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/test/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/EgressRouterTest.java b/kubernetes-model-generator/openshift-model-operator/src/test/java/io/fabric8/openshift/api/model/operator/network/v1/EgressRouterTest.java similarity index 92% rename from kubernetes-model-generator/openshift-model-miscellaneous/src/test/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/EgressRouterTest.java rename to kubernetes-model-generator/openshift-model-operator/src/test/java/io/fabric8/openshift/api/model/operator/network/v1/EgressRouterTest.java index d3fa59348ef..61f35e23b13 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/test/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/EgressRouterTest.java +++ b/kubernetes-model-generator/openshift-model-operator/src/test/java/io/fabric8/openshift/api/model/operator/network/v1/EgressRouterTest.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.fabric8.openshift.api.model.miscellaneous.network.operator.v1; +package io.fabric8.openshift.api.model.operator.network.v1; import com.fasterxml.jackson.databind.ObjectMapper; +import io.fabric8.kubernetes.model.util.Helper; import org.junit.jupiter.api.Test; import java.io.IOException; -import java.util.Scanner; import static net.javacrumbs.jsonunit.core.Option.IGNORING_ARRAY_ORDER; import static net.javacrumbs.jsonunit.core.Option.IGNORING_EXTRA_FIELDS; @@ -34,9 +34,7 @@ class EgressRouterTest { @Test void deserializationAndSerializationShouldWorkAsExpected() throws IOException { // Given - final String originalJson = new Scanner(getClass().getResourceAsStream("/valid-egressrouter.json")) - .useDelimiter("\\A") - .next(); + final String originalJson = Helper.loadJson("/valid-egressrouter.json"); // When final EgressRouter egressRouter = mapper.readValue(originalJson, EgressRouter.class); diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/test/resources/valid-egressrouter.json b/kubernetes-model-generator/openshift-model-operator/src/test/resources/valid-egressrouter.json similarity index 100% rename from kubernetes-model-generator/openshift-model-miscellaneous/src/test/resources/valid-egressrouter.json rename to kubernetes-model-generator/openshift-model-operator/src/test/resources/valid-egressrouter.json diff --git a/kubernetes-model-generator/openshift-model-operatorhub/pom.xml b/kubernetes-model-generator/openshift-model-operatorhub/pom.xml index 1b56831ec87..5632e42292f 100644 --- a/kubernetes-model-generator/openshift-model-operatorhub/pom.xml +++ b/kubernetes-model-generator/openshift-model-operatorhub/pom.xml @@ -49,7 +49,7 @@ io.fabric8 - kubernetes-model-common + kubernetes-model-admissionregistration org.assertj diff --git a/kubernetes-model-generator/openshift-model/Makefile b/kubernetes-model-generator/openshift-model/Makefile deleted file mode 100644 index c09a7003874..00000000000 --- a/kubernetes-model-generator/openshift-model/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# -# 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. -# - -SHELL := /bin/bash - -all: build - -build: gobuild - mvn -Pgenerate clean install -DskipTests - -gobuild: - CGO_ENABLED=0 GO15VENDOREXPERIMENT=1 go build -a ./cmd/generate/generate.go - ./generate > src/main/resources/schema/kube-schema.json - ./generate validation > src/main/resources/schema/validation-schema.json diff --git a/kubernetes-model-generator/openshift-model/cmd/generate/generate.go b/kubernetes-model-generator/openshift-model/cmd/generate/generate.go deleted file mode 100644 index 9630a0f44a5..00000000000 --- a/kubernetes-model-generator/openshift-model/cmd/generate/generate.go +++ /dev/null @@ -1,254 +0,0 @@ -/** - * 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 main - -import ( - "bytes" - "encoding/json" - "fmt" - "log" - "reflect" - "strings" - "time" - - appsapi "github.com/openshift/api/apps/v1" - authapi "github.com/openshift/api/authorization/v1" - buildapi "github.com/openshift/api/build/v1" - openshiftconfig "github.com/openshift/api/config/v1" - helmapiv1beta1 "github.com/openshift/api/helm/v1beta1" - imageapi "github.com/openshift/api/image/v1" - networkapi "github.com/openshift/api/network/v1" - oauthapi "github.com/openshift/api/oauth/v1" - projectapi "github.com/openshift/api/project/v1" - quotaapi "github.com/openshift/api/quota/v1" - routeapi "github.com/openshift/api/route/v1" - securityapi "github.com/openshift/api/security/v1" - templateapi "github.com/openshift/api/template/v1" - userapi "github.com/openshift/api/user/v1" - authenticationapi "k8s.io/api/authentication/v1" - rbac "k8s.io/api/rbac/v1" // depends - "k8s.io/apimachinery/pkg/api/resource" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - apimachineryversion "k8s.io/apimachinery/pkg/version" - configapi "k8s.io/client-go/tools/clientcmd/api/v1" - - "os" - - "github.com/fabric8io/kubernetes-client/kubernetes-model-generator/pkg/schemagen" -) - -type Schema struct { - Info apimachineryversion.Info - APIGroup metav1.APIGroup - APIGroupList metav1.APIGroupList - BaseKubernetesList metav1.List - ObjectMeta metav1.ObjectMeta - TypeMeta metav1.TypeMeta - SecurityContextConstraints securityapi.SecurityContextConstraints - SecurityContextConstraintsList securityapi.SecurityContextConstraintsList - PodSecurityPolicyReview securityapi.PodSecurityPolicyReview - PodSecurityPolicySelfSubjectReview securityapi.PodSecurityPolicySelfSubjectReview - PodSecurityPolicySubjectReview securityapi.PodSecurityPolicySubjectReview - RangeAllocation securityapi.RangeAllocation - RangeAllocationList securityapi.RangeAllocationList - Status metav1.Status - Patch metav1.Patch - ListOptions metav1.ListOptions - DeleteOptions metav1.DeleteOptions - CreateOptions metav1.CreateOptions - UpdateOptions metav1.UpdateOptions - GetOptions metav1.GetOptions - PatchOptions metav1.PatchOptions - Time metav1.Time - Quantity resource.Quantity - BuildRequest buildapi.BuildRequest - BuildList buildapi.BuildList - BuildConfigList buildapi.BuildConfigList - ImageList imageapi.ImageList - ImageTag imageapi.ImageTag - ImageTagList imageapi.ImageTagList - ImageStreamList imageapi.ImageStreamList - ImageStreamTagList imageapi.ImageStreamTagList - ImageStreamImport imageapi.ImageStreamImport - ImageStreamImage imageapi.ImageStreamImage - ImageStreamMapping imageapi.ImageStreamMapping - ImageSignature imageapi.ImageSignature - DeploymentConfig appsapi.DeploymentConfig - DeploymentConfigList appsapi.DeploymentConfigList - DeploymentConfigRollback appsapi.DeploymentConfigRollback - Route routeapi.Route - RouteList routeapi.RouteList - Template templateapi.Template - TemplateList templateapi.TemplateList - TemplateInstance templateapi.TemplateInstance - TemplateInstanceList templateapi.TemplateInstanceList - BrokerTemplateInstance templateapi.BrokerTemplateInstance - BrokerTemplateInstanceList templateapi.BrokerTemplateInstanceList - TagEvent imageapi.TagEvent - OAuthClient oauthapi.OAuthClient - OAuthAccessToken oauthapi.OAuthAccessToken - OAuthAuthorizeToken oauthapi.OAuthAuthorizeToken - OAuthClientAuthorization oauthapi.OAuthClientAuthorization - OAuthAccessTokenList oauthapi.OAuthAccessTokenList - OAuthAuthorizeTokenList oauthapi.OAuthAuthorizeTokenList - OAuthClientList oauthapi.OAuthClientList - OAuthClientAuthorizationList oauthapi.OAuthClientAuthorizationList - OpenshiftClusterRoleScopeRestriction oauthapi.ClusterRoleScopeRestriction - UserOAuthAccessToken oauthapi.UserOAuthAccessToken - UserOAuthAccessTokenList oauthapi.UserOAuthAccessTokenList - TokenReview authenticationapi.TokenReview - OpenshiftRole authapi.Role - OpenshiftRoleList authapi.RoleList - OpenshiftRoleBinding authapi.RoleBinding - OpenshiftRoleBindingList authapi.RoleBindingList - OpenshiftRoleBindingRestriction authapi.RoleBindingRestriction - OpenShiftRoleBindingRestrictionList authapi.RoleBindingRestrictionList - OpenshiftRoleBindingRestrictionSpec authapi.RoleBindingRestrictionSpec - LocalSubjectAccessReview authapi.LocalSubjectAccessReview - LocalResourceAccessReview authapi.LocalResourceAccessReview - ResourceAccessReview authapi.ResourceAccessReview - ResourceAccessReviewResponse authapi.ResourceAccessReviewResponse - SubjectAccessReview authapi.SubjectAccessReview - SubjectAccessReviewResponse authapi.SubjectAccessReviewResponse - SubjectRulesReview authapi.SubjectRulesReview - SelfSubjectRulesReview authapi.SelfSubjectRulesReview - OpenshiftClusterRole authapi.ClusterRole - OpenshiftClusterRoleList authapi.ClusterRoleList - OpenshiftClusterRoleBinding authapi.ClusterRoleBinding - OpenshiftClusterRoleBindingList authapi.ClusterRoleBindingList - User userapi.User - UserList userapi.UserList - Group userapi.Group - GroupList userapi.GroupList - Identity userapi.Identity - IdentityList userapi.IdentityList - UserIdentityMapping userapi.UserIdentityMapping - Config configapi.Config - RootPaths metav1.RootPaths - Project projectapi.Project - ProjectList projectapi.ProjectList - ProjectRequest projectapi.ProjectRequest - // Added JSONSchemaPropsorStringArray here because of - // https://github.com/joelittlejohn/jsonschema2pojo/issues/866 - AggregationRule rbac.AggregationRule - NetNamespace networkapi.NetNamespace - NetNamespaceList networkapi.NetNamespaceList - ClusterNetwork networkapi.ClusterNetwork - ClusterNetworkList networkapi.ClusterNetworkList - EgressNetworkPolicy networkapi.EgressNetworkPolicy - EgressNetworkPolicyList networkapi.EgressNetworkPolicyList - HostSubnet networkapi.HostSubnet - HostSubnetList networkapi.HostSubnetList - AppliedClusterResourceQuota quotaapi.AppliedClusterResourceQuota - AppliedClusterResourceQuotaList quotaapi.AppliedClusterResourceQuotaList - ClusterResourceQuota quotaapi.ClusterResourceQuota - ClusterResourceQuotaList quotaapi.ClusterResourceQuotaList - HelmChartRepository helmapiv1beta1.HelmChartRepository - HelmChartRepositoryList helmapiv1beta1.HelmChartRepositoryList - ProjectHelmChartRepository helmapiv1beta1.ProjectHelmChartRepository - ProjectHelmChartRepositoryList helmapiv1beta1.ProjectHelmChartRepositoryList -} - -func main() { - packages := []schemagen.PackageDescriptor{ - {"k8s.io/api/core/v1", "", "io.fabric8.kubernetes.api.model", "kubernetes_core_", false}, - {"k8s.io/apimachinery/pkg/api/resource", "", "io.fabric8.kubernetes.api.model", "kubernetes_resource_", false}, - {"k8s.io/apimachinery/pkg/util/intstr", "", "io.fabric8.kubernetes.api.model", "kubernetes_apimachinery_pkg_util_intstr_", false}, - {"k8s.io/apimachinery/pkg/runtime", "", "io.fabric8.openshift.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/kubernetes/pkg/util", "", "io.fabric8.kubernetes.api.model", "kubernetes_util_", false}, - {"k8s.io/kubernetes/pkg/api/errors", "", "io.fabric8.kubernetes.api.model", "kubernetes_errors_", false}, - {"k8s.io/client-go/tools/clientcmd/api/v1", "", "io.fabric8.kubernetes.api.model", "kubernetes_config_", false}, - {"k8s.io/kubernetes/pkg/api/unversioned", "", "io.fabric8.kubernetes.api.model", "api_", false}, - {"k8s.io/api/authentication/v1", "authentication.k8s.io", "io.fabric8.kubernetes.api.model.authentication", "kubernetes_authentication_", false}, - {"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1", "", "io.fabric8.kubernetes.api.model.apiextensions", "kubernetes_apiextensions_", false}, - {"k8s.io/apimachinery/pkg/apis/meta/v1", "", "io.fabric8.kubernetes.api.model", "kubernetes_apimachinery_", false}, - {"k8s.io/api/rbac/v1", "rbac.authorization.k8s.io", "io.fabric8.kubernetes.api.model.rbac", "kubernetes_rbac_", false}, - {"github.com/openshift/api/build/v1", "", "io.fabric8.openshift.api.model", "os_build_", true}, - {"github.com/openshift/api/apps/v1", "", "io.fabric8.openshift.api.model", "os_deploy_", true}, - {"github.com/openshift/api/image/v1", "", "io.fabric8.openshift.api.model", "os_image_", true}, - {"github.com/openshift/api/oauth/v1", "", "io.fabric8.openshift.api.model", "os_oauth_", true}, - {"github.com/openshift/api/route/v1", "", "io.fabric8.openshift.api.model", "os_route_", true}, - {"github.com/openshift/api/template/v1", "", "io.fabric8.openshift.api.model", "os_template_", true}, - {"github.com/openshift/api/user/v1", "", "io.fabric8.openshift.api.model", "os_user_", true}, - {"github.com/openshift/api/authorization/v1", "", "io.fabric8.openshift.api.model", "os_authorization_", true}, - {"github.com/openshift/api/project/v1", "", "io.fabric8.openshift.api.model", "os_project_", true}, - {"github.com/openshift/api/security/v1", "", "io.fabric8.openshift.api.model", "os_security_", true}, - {"github.com/openshift/api/network/v1", "", "io.fabric8.openshift.api.model", "os_network_", true}, - {"github.com/openshift/api/config/v1", "", "io.fabric8.openshift.api.model.config.v1", "os_config_v1_", false}, - {"github.com/openshift/api/quota/v1", "", "io.fabric8.openshift.api.model", "os_quota_", true}, - {"github.com/openshift/api/helm/v1beta1", "", "io.fabric8.openshift.api.model", "os_helm_v1beta1_", true}, - } - - typeMap := map[reflect.Type]reflect.Type{ - reflect.TypeOf(time.Time{}): reflect.TypeOf(""), - reflect.TypeOf(struct{}{}): reflect.TypeOf(""), - } - manualTypeMap := map[reflect.Type]string{ - reflect.TypeOf(openshiftconfig.ConfigMapNameReference{}): "io.fabric8.openshift.api.model.config.v1.BuildSpecBDDPTrustedCA", - reflect.TypeOf(openshiftconfig.SecretNameReference{}): "io.fabric8.openshift.api.model.config.v1.OAuthSpecIPBasicAuthCa", - } - schema, err := schemagen.GenerateSchema(reflect.TypeOf(Schema{}), packages, typeMap, manualTypeMap, "openshift") - if err != nil { - fmt.Fprintf(os.Stderr, "An error occurred: %v", err) - return - } - - // maintain the existing mapping - schema.Resources["image"].Properties["dockerImageMetadata"] = schemagen.JSONPropertyDescriptor{ - ExistingJavaTypeDescriptor: &schemagen.ExistingJavaTypeDescriptor{ - ExistingJavaType: "io.fabric8.openshift.api.model.runtime.RawExtension", - }, - } - // top level template objects need to be typed/hasmetadata to do anything - schema.Resources["template"].Properties["objects"] = schemagen.JSONPropertyDescriptor{ - ExistingJavaTypeDescriptor: &schemagen.ExistingJavaTypeDescriptor{ - ExistingJavaType: "java.util.List", - }, - } - - serdes := map[string]*schemagen.JavaSerDeDescriptor{ - "os_template_Template": &schemagen.JavaSerDeDescriptor{ - Deserializer: "io.fabric8.openshift.api.model.TemplateDeserializer.class", - }, - } - - for definitionKey, descriptor := range serdes { - val := schema.Definitions[definitionKey] - val.JavaSerDeDescriptor = descriptor - schema.Definitions[definitionKey] = val - } - - args := os.Args[1:] - if len(args) < 1 || args[0] != "validation" { - schema.Resources = nil - } - - b, err := json.Marshal(&schema) - if err != nil { - log.Fatal(err) - } - result := string(b) - result = strings.Replace(result, "\"additionalProperty\":", "\"additionalProperties\":", -1) - - var out bytes.Buffer - err = json.Indent(&out, []byte(result), "", " ") - if err != nil { - log.Fatal(err) - } - - fmt.Println(out.String()) -} diff --git a/kubernetes-model-generator/openshift-model/pom.xml b/kubernetes-model-generator/openshift-model/pom.xml index 5bbf6753e6b..5d34821d08f 100644 --- a/kubernetes-model-generator/openshift-model/pom.xml +++ b/kubernetes-model-generator/openshift-model/pom.xml @@ -35,7 +35,6 @@ * io.fabric8.openshift.api.model**, - io.fabric8.openshift.api.model.helm.v1beta1** @@ -48,24 +47,7 @@ io.fabric8 kubernetes-model-rbac - - io.fabric8 - kubernetes-model-admissionregistration - - - io.fabric8 - kubernetes-model-common - - - io.fabric8 - openshift-model-config - - - org.junit.jupiter - junit-jupiter-engine - test - org.assertj assertj-core @@ -73,31 +55,80 @@ - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifacts - - false - - - - - - - generate - org.jsonschema2pojo - jsonschema2pojo-maven-plugin + io.fabric8 + openapi-model-generator-maven-plugin + + + + ${openapi.schema.openshift-latest} + ${project.basedir}/../openapi/schemas/openshift-authorization.json + ${project.basedir}/../openapi/schemas/openshift-security.json + + + io.fabric8.kubernetes.api.model + io.fabric8.openshift.api.model + io.fabric8.openshift.api.model + io.fabric8.openshift.api.model + io.fabric8.openshift.api.model + io.fabric8.openshift.api.model + io.fabric8.openshift.api.model + io.fabric8.openshift.api.model + io.fabric8.openshift.api.model + io.fabric8.openshift.api.model + io.fabric8.openshift.api.model + io.fabric8.openshift.api.model + io.fabric8.openshift.api.model + io.fabric8.openshift.api.model + io.fabric8.openshift.api.model + io.fabric8.openshift.api.model + + + ^com\.github\.openshift\.api\..*$ + ^io\.openshift\.authorization\..*$ + ^io\.openshift\.quota\..*$ + ^io\.openshift\.security\..*$ + + + ^com\.github\.openshift\.api\.image\.v1\.SecretList$ + + + + #/components/schemas/io.k8s.api.core.v1.ConfigMapVolumeSource_v2 + io.fabric8.kubernetes.api.model.ConfigMapVolumeSource + + + #/components/schemas/io.k8s.api.core.v1.LocalObjectReference_v2 + io.fabric8.kubernetes.api.model.LocalObjectReference + + + #/components/schemas/io.k8s.api.core.v1.ResourceQuotaSpec_v2 + io.fabric8.kubernetes.api.model.ResourceQuotaSpec + + + #/components/schemas/io.k8s.api.core.v1.SecretVolumeSource_v2 + io.fabric8.kubernetes.api.model.SecretVolumeSource + + + #/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.Status_v5 + io.fabric8.kubernetes.api.model.Status + + + #/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.LabelSelector_v4 + io.fabric8.kubernetes.api.model.LabelSelector + + + #/components/schemas/io.k8s.api.rbac.v1.AggregationRule_v2 + io.fabric8.kubernetes.api.model.rbac.AggregationRule + + + + diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java deleted file mode 100644 index 428739597eb..00000000000 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ /dev/null @@ -1,1417 +0,0 @@ - -package io.fabric8.kubernetes.api.model; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; -import io.fabric8.kubernetes.api.model.authentication.TokenReview; -import io.fabric8.kubernetes.api.model.rbac.AggregationRule; -import io.fabric8.kubernetes.api.model.version.Info; -import io.fabric8.openshift.api.model.AppliedClusterResourceQuota; -import io.fabric8.openshift.api.model.AppliedClusterResourceQuotaList; -import io.fabric8.openshift.api.model.BrokerTemplateInstance; -import io.fabric8.openshift.api.model.BrokerTemplateInstanceList; -import io.fabric8.openshift.api.model.BuildConfigList; -import io.fabric8.openshift.api.model.BuildList; -import io.fabric8.openshift.api.model.BuildRequest; -import io.fabric8.openshift.api.model.ClusterNetwork; -import io.fabric8.openshift.api.model.ClusterNetworkList; -import io.fabric8.openshift.api.model.ClusterResourceQuota; -import io.fabric8.openshift.api.model.ClusterResourceQuotaList; -import io.fabric8.openshift.api.model.ClusterRole; -import io.fabric8.openshift.api.model.ClusterRoleBinding; -import io.fabric8.openshift.api.model.ClusterRoleBindingList; -import io.fabric8.openshift.api.model.ClusterRoleList; -import io.fabric8.openshift.api.model.ClusterRoleScopeRestriction; -import io.fabric8.openshift.api.model.DeploymentConfig; -import io.fabric8.openshift.api.model.DeploymentConfigList; -import io.fabric8.openshift.api.model.DeploymentConfigRollback; -import io.fabric8.openshift.api.model.EgressNetworkPolicy; -import io.fabric8.openshift.api.model.EgressNetworkPolicyList; -import io.fabric8.openshift.api.model.Group; -import io.fabric8.openshift.api.model.GroupList; -import io.fabric8.openshift.api.model.HelmChartRepository; -import io.fabric8.openshift.api.model.HelmChartRepositoryList; -import io.fabric8.openshift.api.model.HostSubnet; -import io.fabric8.openshift.api.model.HostSubnetList; -import io.fabric8.openshift.api.model.Identity; -import io.fabric8.openshift.api.model.IdentityList; -import io.fabric8.openshift.api.model.ImageList; -import io.fabric8.openshift.api.model.ImageSignature; -import io.fabric8.openshift.api.model.ImageStreamImage; -import io.fabric8.openshift.api.model.ImageStreamImport; -import io.fabric8.openshift.api.model.ImageStreamList; -import io.fabric8.openshift.api.model.ImageStreamMapping; -import io.fabric8.openshift.api.model.ImageStreamTagList; -import io.fabric8.openshift.api.model.ImageTag; -import io.fabric8.openshift.api.model.ImageTagList; -import io.fabric8.openshift.api.model.LocalResourceAccessReview; -import io.fabric8.openshift.api.model.LocalSubjectAccessReview; -import io.fabric8.openshift.api.model.NetNamespace; -import io.fabric8.openshift.api.model.NetNamespaceList; -import io.fabric8.openshift.api.model.OAuthAccessToken; -import io.fabric8.openshift.api.model.OAuthAccessTokenList; -import io.fabric8.openshift.api.model.OAuthAuthorizeToken; -import io.fabric8.openshift.api.model.OAuthAuthorizeTokenList; -import io.fabric8.openshift.api.model.OAuthClient; -import io.fabric8.openshift.api.model.OAuthClientAuthorization; -import io.fabric8.openshift.api.model.OAuthClientAuthorizationList; -import io.fabric8.openshift.api.model.OAuthClientList; -import io.fabric8.openshift.api.model.PodSecurityPolicyReview; -import io.fabric8.openshift.api.model.PodSecurityPolicySelfSubjectReview; -import io.fabric8.openshift.api.model.PodSecurityPolicySubjectReview; -import io.fabric8.openshift.api.model.Project; -import io.fabric8.openshift.api.model.ProjectHelmChartRepository; -import io.fabric8.openshift.api.model.ProjectHelmChartRepositoryList; -import io.fabric8.openshift.api.model.ProjectList; -import io.fabric8.openshift.api.model.ProjectRequest; -import io.fabric8.openshift.api.model.RangeAllocation; -import io.fabric8.openshift.api.model.RangeAllocationList; -import io.fabric8.openshift.api.model.ResourceAccessReview; -import io.fabric8.openshift.api.model.ResourceAccessReviewResponse; -import io.fabric8.openshift.api.model.Role; -import io.fabric8.openshift.api.model.RoleBinding; -import io.fabric8.openshift.api.model.RoleBindingList; -import io.fabric8.openshift.api.model.RoleBindingRestriction; -import io.fabric8.openshift.api.model.RoleBindingRestrictionList; -import io.fabric8.openshift.api.model.RoleBindingRestrictionSpec; -import io.fabric8.openshift.api.model.RoleList; -import io.fabric8.openshift.api.model.Route; -import io.fabric8.openshift.api.model.RouteList; -import io.fabric8.openshift.api.model.SecurityContextConstraints; -import io.fabric8.openshift.api.model.SecurityContextConstraintsList; -import io.fabric8.openshift.api.model.SelfSubjectRulesReview; -import io.fabric8.openshift.api.model.SubjectAccessReview; -import io.fabric8.openshift.api.model.SubjectAccessReviewResponse; -import io.fabric8.openshift.api.model.SubjectRulesReview; -import io.fabric8.openshift.api.model.TagEvent; -import io.fabric8.openshift.api.model.Template; -import io.fabric8.openshift.api.model.TemplateInstance; -import io.fabric8.openshift.api.model.TemplateInstanceList; -import io.fabric8.openshift.api.model.TemplateList; -import io.fabric8.openshift.api.model.User; -import io.fabric8.openshift.api.model.UserIdentityMapping; -import io.fabric8.openshift.api.model.UserList; -import io.fabric8.openshift.api.model.UserOAuthAccessToken; -import io.fabric8.openshift.api.model.UserOAuthAccessTokenList; - -@Generated("jsonschema2pojo") -public class KubeSchema { - - private APIGroup aPIGroup; - private APIGroupList aPIGroupList; - private AggregationRule aggregationRule; - private AppliedClusterResourceQuota appliedClusterResourceQuota; - private AppliedClusterResourceQuotaList appliedClusterResourceQuotaList; - private KubernetesList baseKubernetesList; - private BrokerTemplateInstance brokerTemplateInstance; - private BrokerTemplateInstanceList brokerTemplateInstanceList; - private BuildConfigList buildConfigList; - private BuildList buildList; - private BuildRequest buildRequest; - private ClusterNetwork clusterNetwork; - private ClusterNetworkList clusterNetworkList; - private ClusterResourceQuota clusterResourceQuota; - private ClusterResourceQuotaList clusterResourceQuotaList; - private Config config; - private CreateOptions createOptions; - private DeleteOptions deleteOptions; - private DeploymentConfig deploymentConfig; - private DeploymentConfigList deploymentConfigList; - private DeploymentConfigRollback deploymentConfigRollback; - private EgressNetworkPolicy egressNetworkPolicy; - private EgressNetworkPolicyList egressNetworkPolicyList; - private GetOptions getOptions; - private Group group; - private GroupList groupList; - private HelmChartRepository helmChartRepository; - private HelmChartRepositoryList helmChartRepositoryList; - private HostSubnet hostSubnet; - private HostSubnetList hostSubnetList; - private Identity identity; - private IdentityList identityList; - private ImageList imageList; - private ImageSignature imageSignature; - private ImageStreamImage imageStreamImage; - private ImageStreamImport imageStreamImport; - private ImageStreamList imageStreamList; - private ImageStreamMapping imageStreamMapping; - private ImageStreamTagList imageStreamTagList; - private ImageTag imageTag; - private ImageTagList imageTagList; - private Info info; - private ListOptions listOptions; - private LocalResourceAccessReview localResourceAccessReview; - private LocalSubjectAccessReview localSubjectAccessReview; - private NetNamespace netNamespace; - private NetNamespaceList netNamespaceList; - private OAuthAccessToken oAuthAccessToken; - private OAuthAccessTokenList oAuthAccessTokenList; - private OAuthAuthorizeToken oAuthAuthorizeToken; - private OAuthAuthorizeTokenList oAuthAuthorizeTokenList; - private OAuthClient oAuthClient; - private OAuthClientAuthorization oAuthClientAuthorization; - private OAuthClientAuthorizationList oAuthClientAuthorizationList; - private OAuthClientList oAuthClientList; - private ObjectMeta objectMeta; - private RoleBindingRestrictionList openShiftRoleBindingRestrictionList; - private ClusterRole openshiftClusterRole; - private ClusterRoleBinding openshiftClusterRoleBinding; - private ClusterRoleBindingList openshiftClusterRoleBindingList; - private ClusterRoleList openshiftClusterRoleList; - private ClusterRoleScopeRestriction openshiftClusterRoleScopeRestriction; - private Role openshiftRole; - private RoleBinding openshiftRoleBinding; - private RoleBindingList openshiftRoleBindingList; - private RoleBindingRestriction openshiftRoleBindingRestriction; - private RoleBindingRestrictionSpec openshiftRoleBindingRestrictionSpec; - private RoleList openshiftRoleList; - private Patch patch; - private PatchOptions patchOptions; - private PodSecurityPolicyReview podSecurityPolicyReview; - private PodSecurityPolicySelfSubjectReview podSecurityPolicySelfSubjectReview; - private PodSecurityPolicySubjectReview podSecurityPolicySubjectReview; - private Project project; - private ProjectHelmChartRepository projectHelmChartRepository; - private ProjectHelmChartRepositoryList projectHelmChartRepositoryList; - private ProjectList projectList; - private ProjectRequest projectRequest; - private Quantity quantity; - private RangeAllocation rangeAllocation; - private RangeAllocationList rangeAllocationList; - private ResourceAccessReview resourceAccessReview; - private ResourceAccessReviewResponse resourceAccessReviewResponse; - private RootPaths rootPaths; - private Route route; - private RouteList routeList; - private SecurityContextConstraints securityContextConstraints; - private SecurityContextConstraintsList securityContextConstraintsList; - private SelfSubjectRulesReview selfSubjectRulesReview; - private Status status; - private SubjectAccessReview subjectAccessReview; - private SubjectAccessReviewResponse subjectAccessReviewResponse; - private SubjectRulesReview subjectRulesReview; - private TagEvent tagEvent; - private Template template; - private TemplateInstance templateInstance; - private TemplateInstanceList templateInstanceList; - private TemplateList templateList; - private String time; - private TokenReview tokenReview; - private TypeMeta typeMeta; - private UpdateOptions updateOptions; - private User user; - private UserIdentityMapping userIdentityMapping; - private UserList userList; - private UserOAuthAccessToken userOAuthAccessToken; - private UserOAuthAccessTokenList userOAuthAccessTokenList; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public KubeSchema() { - } - - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, AggregationRule aggregationRule, AppliedClusterResourceQuota appliedClusterResourceQuota, AppliedClusterResourceQuotaList appliedClusterResourceQuotaList, KubernetesList baseKubernetesList, BrokerTemplateInstance brokerTemplateInstance, BrokerTemplateInstanceList brokerTemplateInstanceList, BuildConfigList buildConfigList, BuildList buildList, BuildRequest buildRequest, ClusterNetwork clusterNetwork, ClusterNetworkList clusterNetworkList, ClusterResourceQuota clusterResourceQuota, ClusterResourceQuotaList clusterResourceQuotaList, Config config, CreateOptions createOptions, DeleteOptions deleteOptions, DeploymentConfig deploymentConfig, DeploymentConfigList deploymentConfigList, DeploymentConfigRollback deploymentConfigRollback, EgressNetworkPolicy egressNetworkPolicy, EgressNetworkPolicyList egressNetworkPolicyList, GetOptions getOptions, Group group, GroupList groupList, HelmChartRepository helmChartRepository, HelmChartRepositoryList helmChartRepositoryList, HostSubnet hostSubnet, HostSubnetList hostSubnetList, Identity identity, IdentityList identityList, ImageList imageList, ImageSignature imageSignature, ImageStreamImage imageStreamImage, ImageStreamImport imageStreamImport, ImageStreamList imageStreamList, ImageStreamMapping imageStreamMapping, ImageStreamTagList imageStreamTagList, ImageTag imageTag, ImageTagList imageTagList, Info info, ListOptions listOptions, LocalResourceAccessReview localResourceAccessReview, LocalSubjectAccessReview localSubjectAccessReview, NetNamespace netNamespace, NetNamespaceList netNamespaceList, OAuthAccessToken oAuthAccessToken, OAuthAccessTokenList oAuthAccessTokenList, OAuthAuthorizeToken oAuthAuthorizeToken, OAuthAuthorizeTokenList oAuthAuthorizeTokenList, OAuthClient oAuthClient, OAuthClientAuthorization oAuthClientAuthorization, OAuthClientAuthorizationList oAuthClientAuthorizationList, OAuthClientList oAuthClientList, ObjectMeta objectMeta, RoleBindingRestrictionList openShiftRoleBindingRestrictionList, ClusterRole openshiftClusterRole, ClusterRoleBinding openshiftClusterRoleBinding, ClusterRoleBindingList openshiftClusterRoleBindingList, ClusterRoleList openshiftClusterRoleList, ClusterRoleScopeRestriction openshiftClusterRoleScopeRestriction, Role openshiftRole, RoleBinding openshiftRoleBinding, RoleBindingList openshiftRoleBindingList, RoleBindingRestriction openshiftRoleBindingRestriction, RoleBindingRestrictionSpec openshiftRoleBindingRestrictionSpec, RoleList openshiftRoleList, Patch patch, PatchOptions patchOptions, PodSecurityPolicyReview podSecurityPolicyReview, PodSecurityPolicySelfSubjectReview podSecurityPolicySelfSubjectReview, PodSecurityPolicySubjectReview podSecurityPolicySubjectReview, Project project, ProjectHelmChartRepository projectHelmChartRepository, ProjectHelmChartRepositoryList projectHelmChartRepositoryList, ProjectList projectList, ProjectRequest projectRequest, Quantity quantity, RangeAllocation rangeAllocation, RangeAllocationList rangeAllocationList, ResourceAccessReview resourceAccessReview, ResourceAccessReviewResponse resourceAccessReviewResponse, RootPaths rootPaths, Route route, RouteList routeList, SecurityContextConstraints securityContextConstraints, SecurityContextConstraintsList securityContextConstraintsList, SelfSubjectRulesReview selfSubjectRulesReview, Status status, SubjectAccessReview subjectAccessReview, SubjectAccessReviewResponse subjectAccessReviewResponse, SubjectRulesReview subjectRulesReview, TagEvent tagEvent, Template template, TemplateInstance templateInstance, TemplateInstanceList templateInstanceList, TemplateList templateList, String time, TokenReview tokenReview, TypeMeta typeMeta, UpdateOptions updateOptions, User user, UserIdentityMapping userIdentityMapping, UserList userList, UserOAuthAccessToken userOAuthAccessToken, UserOAuthAccessTokenList userOAuthAccessTokenList) { - super(); - this.aPIGroup = aPIGroup; - this.aPIGroupList = aPIGroupList; - this.aggregationRule = aggregationRule; - this.appliedClusterResourceQuota = appliedClusterResourceQuota; - this.appliedClusterResourceQuotaList = appliedClusterResourceQuotaList; - this.baseKubernetesList = baseKubernetesList; - this.brokerTemplateInstance = brokerTemplateInstance; - this.brokerTemplateInstanceList = brokerTemplateInstanceList; - this.buildConfigList = buildConfigList; - this.buildList = buildList; - this.buildRequest = buildRequest; - this.clusterNetwork = clusterNetwork; - this.clusterNetworkList = clusterNetworkList; - this.clusterResourceQuota = clusterResourceQuota; - this.clusterResourceQuotaList = clusterResourceQuotaList; - this.config = config; - this.createOptions = createOptions; - this.deleteOptions = deleteOptions; - this.deploymentConfig = deploymentConfig; - this.deploymentConfigList = deploymentConfigList; - this.deploymentConfigRollback = deploymentConfigRollback; - this.egressNetworkPolicy = egressNetworkPolicy; - this.egressNetworkPolicyList = egressNetworkPolicyList; - this.getOptions = getOptions; - this.group = group; - this.groupList = groupList; - this.helmChartRepository = helmChartRepository; - this.helmChartRepositoryList = helmChartRepositoryList; - this.hostSubnet = hostSubnet; - this.hostSubnetList = hostSubnetList; - this.identity = identity; - this.identityList = identityList; - this.imageList = imageList; - this.imageSignature = imageSignature; - this.imageStreamImage = imageStreamImage; - this.imageStreamImport = imageStreamImport; - this.imageStreamList = imageStreamList; - this.imageStreamMapping = imageStreamMapping; - this.imageStreamTagList = imageStreamTagList; - this.imageTag = imageTag; - this.imageTagList = imageTagList; - this.info = info; - this.listOptions = listOptions; - this.localResourceAccessReview = localResourceAccessReview; - this.localSubjectAccessReview = localSubjectAccessReview; - this.netNamespace = netNamespace; - this.netNamespaceList = netNamespaceList; - this.oAuthAccessToken = oAuthAccessToken; - this.oAuthAccessTokenList = oAuthAccessTokenList; - this.oAuthAuthorizeToken = oAuthAuthorizeToken; - this.oAuthAuthorizeTokenList = oAuthAuthorizeTokenList; - this.oAuthClient = oAuthClient; - this.oAuthClientAuthorization = oAuthClientAuthorization; - this.oAuthClientAuthorizationList = oAuthClientAuthorizationList; - this.oAuthClientList = oAuthClientList; - this.objectMeta = objectMeta; - this.openShiftRoleBindingRestrictionList = openShiftRoleBindingRestrictionList; - this.openshiftClusterRole = openshiftClusterRole; - this.openshiftClusterRoleBinding = openshiftClusterRoleBinding; - this.openshiftClusterRoleBindingList = openshiftClusterRoleBindingList; - this.openshiftClusterRoleList = openshiftClusterRoleList; - this.openshiftClusterRoleScopeRestriction = openshiftClusterRoleScopeRestriction; - this.openshiftRole = openshiftRole; - this.openshiftRoleBinding = openshiftRoleBinding; - this.openshiftRoleBindingList = openshiftRoleBindingList; - this.openshiftRoleBindingRestriction = openshiftRoleBindingRestriction; - this.openshiftRoleBindingRestrictionSpec = openshiftRoleBindingRestrictionSpec; - this.openshiftRoleList = openshiftRoleList; - this.patch = patch; - this.patchOptions = patchOptions; - this.podSecurityPolicyReview = podSecurityPolicyReview; - this.podSecurityPolicySelfSubjectReview = podSecurityPolicySelfSubjectReview; - this.podSecurityPolicySubjectReview = podSecurityPolicySubjectReview; - this.project = project; - this.projectHelmChartRepository = projectHelmChartRepository; - this.projectHelmChartRepositoryList = projectHelmChartRepositoryList; - this.projectList = projectList; - this.projectRequest = projectRequest; - this.quantity = quantity; - this.rangeAllocation = rangeAllocation; - this.rangeAllocationList = rangeAllocationList; - this.resourceAccessReview = resourceAccessReview; - this.resourceAccessReviewResponse = resourceAccessReviewResponse; - this.rootPaths = rootPaths; - this.route = route; - this.routeList = routeList; - this.securityContextConstraints = securityContextConstraints; - this.securityContextConstraintsList = securityContextConstraintsList; - this.selfSubjectRulesReview = selfSubjectRulesReview; - this.status = status; - this.subjectAccessReview = subjectAccessReview; - this.subjectAccessReviewResponse = subjectAccessReviewResponse; - this.subjectRulesReview = subjectRulesReview; - this.tagEvent = tagEvent; - this.template = template; - this.templateInstance = templateInstance; - this.templateInstanceList = templateInstanceList; - this.templateList = templateList; - this.time = time; - this.tokenReview = tokenReview; - this.typeMeta = typeMeta; - this.updateOptions = updateOptions; - this.user = user; - this.userIdentityMapping = userIdentityMapping; - this.userList = userList; - this.userOAuthAccessToken = userOAuthAccessToken; - this.userOAuthAccessTokenList = userOAuthAccessTokenList; - } - - @JsonProperty("APIGroup") - public APIGroup getAPIGroup() { - return aPIGroup; - } - - @JsonProperty("APIGroup") - public void setAPIGroup(APIGroup aPIGroup) { - this.aPIGroup = aPIGroup; - } - - @JsonProperty("APIGroupList") - public APIGroupList getAPIGroupList() { - return aPIGroupList; - } - - @JsonProperty("APIGroupList") - public void setAPIGroupList(APIGroupList aPIGroupList) { - this.aPIGroupList = aPIGroupList; - } - - @JsonProperty("AggregationRule") - public AggregationRule getAggregationRule() { - return aggregationRule; - } - - @JsonProperty("AggregationRule") - public void setAggregationRule(AggregationRule aggregationRule) { - this.aggregationRule = aggregationRule; - } - - @JsonProperty("AppliedClusterResourceQuota") - public AppliedClusterResourceQuota getAppliedClusterResourceQuota() { - return appliedClusterResourceQuota; - } - - @JsonProperty("AppliedClusterResourceQuota") - public void setAppliedClusterResourceQuota(AppliedClusterResourceQuota appliedClusterResourceQuota) { - this.appliedClusterResourceQuota = appliedClusterResourceQuota; - } - - @JsonProperty("AppliedClusterResourceQuotaList") - public AppliedClusterResourceQuotaList getAppliedClusterResourceQuotaList() { - return appliedClusterResourceQuotaList; - } - - @JsonProperty("AppliedClusterResourceQuotaList") - public void setAppliedClusterResourceQuotaList(AppliedClusterResourceQuotaList appliedClusterResourceQuotaList) { - this.appliedClusterResourceQuotaList = appliedClusterResourceQuotaList; - } - - @JsonProperty("BaseKubernetesList") - public KubernetesList getBaseKubernetesList() { - return baseKubernetesList; - } - - @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(KubernetesList baseKubernetesList) { - this.baseKubernetesList = baseKubernetesList; - } - - @JsonProperty("BrokerTemplateInstance") - public BrokerTemplateInstance getBrokerTemplateInstance() { - return brokerTemplateInstance; - } - - @JsonProperty("BrokerTemplateInstance") - public void setBrokerTemplateInstance(BrokerTemplateInstance brokerTemplateInstance) { - this.brokerTemplateInstance = brokerTemplateInstance; - } - - @JsonProperty("BrokerTemplateInstanceList") - public BrokerTemplateInstanceList getBrokerTemplateInstanceList() { - return brokerTemplateInstanceList; - } - - @JsonProperty("BrokerTemplateInstanceList") - public void setBrokerTemplateInstanceList(BrokerTemplateInstanceList brokerTemplateInstanceList) { - this.brokerTemplateInstanceList = brokerTemplateInstanceList; - } - - @JsonProperty("BuildConfigList") - public BuildConfigList getBuildConfigList() { - return buildConfigList; - } - - @JsonProperty("BuildConfigList") - public void setBuildConfigList(BuildConfigList buildConfigList) { - this.buildConfigList = buildConfigList; - } - - @JsonProperty("BuildList") - public BuildList getBuildList() { - return buildList; - } - - @JsonProperty("BuildList") - public void setBuildList(BuildList buildList) { - this.buildList = buildList; - } - - @JsonProperty("BuildRequest") - public BuildRequest getBuildRequest() { - return buildRequest; - } - - @JsonProperty("BuildRequest") - public void setBuildRequest(BuildRequest buildRequest) { - this.buildRequest = buildRequest; - } - - @JsonProperty("ClusterNetwork") - public ClusterNetwork getClusterNetwork() { - return clusterNetwork; - } - - @JsonProperty("ClusterNetwork") - public void setClusterNetwork(ClusterNetwork clusterNetwork) { - this.clusterNetwork = clusterNetwork; - } - - @JsonProperty("ClusterNetworkList") - public ClusterNetworkList getClusterNetworkList() { - return clusterNetworkList; - } - - @JsonProperty("ClusterNetworkList") - public void setClusterNetworkList(ClusterNetworkList clusterNetworkList) { - this.clusterNetworkList = clusterNetworkList; - } - - @JsonProperty("ClusterResourceQuota") - public ClusterResourceQuota getClusterResourceQuota() { - return clusterResourceQuota; - } - - @JsonProperty("ClusterResourceQuota") - public void setClusterResourceQuota(ClusterResourceQuota clusterResourceQuota) { - this.clusterResourceQuota = clusterResourceQuota; - } - - @JsonProperty("ClusterResourceQuotaList") - public ClusterResourceQuotaList getClusterResourceQuotaList() { - return clusterResourceQuotaList; - } - - @JsonProperty("ClusterResourceQuotaList") - public void setClusterResourceQuotaList(ClusterResourceQuotaList clusterResourceQuotaList) { - this.clusterResourceQuotaList = clusterResourceQuotaList; - } - - @JsonProperty("Config") - public Config getConfig() { - return config; - } - - @JsonProperty("Config") - public void setConfig(Config config) { - this.config = config; - } - - @JsonProperty("CreateOptions") - public CreateOptions getCreateOptions() { - return createOptions; - } - - @JsonProperty("CreateOptions") - public void setCreateOptions(CreateOptions createOptions) { - this.createOptions = createOptions; - } - - @JsonProperty("DeleteOptions") - public DeleteOptions getDeleteOptions() { - return deleteOptions; - } - - @JsonProperty("DeleteOptions") - public void setDeleteOptions(DeleteOptions deleteOptions) { - this.deleteOptions = deleteOptions; - } - - @JsonProperty("DeploymentConfig") - public DeploymentConfig getDeploymentConfig() { - return deploymentConfig; - } - - @JsonProperty("DeploymentConfig") - public void setDeploymentConfig(DeploymentConfig deploymentConfig) { - this.deploymentConfig = deploymentConfig; - } - - @JsonProperty("DeploymentConfigList") - public DeploymentConfigList getDeploymentConfigList() { - return deploymentConfigList; - } - - @JsonProperty("DeploymentConfigList") - public void setDeploymentConfigList(DeploymentConfigList deploymentConfigList) { - this.deploymentConfigList = deploymentConfigList; - } - - @JsonProperty("DeploymentConfigRollback") - public DeploymentConfigRollback getDeploymentConfigRollback() { - return deploymentConfigRollback; - } - - @JsonProperty("DeploymentConfigRollback") - public void setDeploymentConfigRollback(DeploymentConfigRollback deploymentConfigRollback) { - this.deploymentConfigRollback = deploymentConfigRollback; - } - - @JsonProperty("EgressNetworkPolicy") - public EgressNetworkPolicy getEgressNetworkPolicy() { - return egressNetworkPolicy; - } - - @JsonProperty("EgressNetworkPolicy") - public void setEgressNetworkPolicy(EgressNetworkPolicy egressNetworkPolicy) { - this.egressNetworkPolicy = egressNetworkPolicy; - } - - @JsonProperty("EgressNetworkPolicyList") - public EgressNetworkPolicyList getEgressNetworkPolicyList() { - return egressNetworkPolicyList; - } - - @JsonProperty("EgressNetworkPolicyList") - public void setEgressNetworkPolicyList(EgressNetworkPolicyList egressNetworkPolicyList) { - this.egressNetworkPolicyList = egressNetworkPolicyList; - } - - @JsonProperty("GetOptions") - public GetOptions getGetOptions() { - return getOptions; - } - - @JsonProperty("GetOptions") - public void setGetOptions(GetOptions getOptions) { - this.getOptions = getOptions; - } - - @JsonProperty("Group") - public Group getGroup() { - return group; - } - - @JsonProperty("Group") - public void setGroup(Group group) { - this.group = group; - } - - @JsonProperty("GroupList") - public GroupList getGroupList() { - return groupList; - } - - @JsonProperty("GroupList") - public void setGroupList(GroupList groupList) { - this.groupList = groupList; - } - - @JsonProperty("HelmChartRepository") - public HelmChartRepository getHelmChartRepository() { - return helmChartRepository; - } - - @JsonProperty("HelmChartRepository") - public void setHelmChartRepository(HelmChartRepository helmChartRepository) { - this.helmChartRepository = helmChartRepository; - } - - @JsonProperty("HelmChartRepositoryList") - public HelmChartRepositoryList getHelmChartRepositoryList() { - return helmChartRepositoryList; - } - - @JsonProperty("HelmChartRepositoryList") - public void setHelmChartRepositoryList(HelmChartRepositoryList helmChartRepositoryList) { - this.helmChartRepositoryList = helmChartRepositoryList; - } - - @JsonProperty("HostSubnet") - public HostSubnet getHostSubnet() { - return hostSubnet; - } - - @JsonProperty("HostSubnet") - public void setHostSubnet(HostSubnet hostSubnet) { - this.hostSubnet = hostSubnet; - } - - @JsonProperty("HostSubnetList") - public HostSubnetList getHostSubnetList() { - return hostSubnetList; - } - - @JsonProperty("HostSubnetList") - public void setHostSubnetList(HostSubnetList hostSubnetList) { - this.hostSubnetList = hostSubnetList; - } - - @JsonProperty("Identity") - public Identity getIdentity() { - return identity; - } - - @JsonProperty("Identity") - public void setIdentity(Identity identity) { - this.identity = identity; - } - - @JsonProperty("IdentityList") - public IdentityList getIdentityList() { - return identityList; - } - - @JsonProperty("IdentityList") - public void setIdentityList(IdentityList identityList) { - this.identityList = identityList; - } - - @JsonProperty("ImageList") - public ImageList getImageList() { - return imageList; - } - - @JsonProperty("ImageList") - public void setImageList(ImageList imageList) { - this.imageList = imageList; - } - - @JsonProperty("ImageSignature") - public ImageSignature getImageSignature() { - return imageSignature; - } - - @JsonProperty("ImageSignature") - public void setImageSignature(ImageSignature imageSignature) { - this.imageSignature = imageSignature; - } - - @JsonProperty("ImageStreamImage") - public ImageStreamImage getImageStreamImage() { - return imageStreamImage; - } - - @JsonProperty("ImageStreamImage") - public void setImageStreamImage(ImageStreamImage imageStreamImage) { - this.imageStreamImage = imageStreamImage; - } - - @JsonProperty("ImageStreamImport") - public ImageStreamImport getImageStreamImport() { - return imageStreamImport; - } - - @JsonProperty("ImageStreamImport") - public void setImageStreamImport(ImageStreamImport imageStreamImport) { - this.imageStreamImport = imageStreamImport; - } - - @JsonProperty("ImageStreamList") - public ImageStreamList getImageStreamList() { - return imageStreamList; - } - - @JsonProperty("ImageStreamList") - public void setImageStreamList(ImageStreamList imageStreamList) { - this.imageStreamList = imageStreamList; - } - - @JsonProperty("ImageStreamMapping") - public ImageStreamMapping getImageStreamMapping() { - return imageStreamMapping; - } - - @JsonProperty("ImageStreamMapping") - public void setImageStreamMapping(ImageStreamMapping imageStreamMapping) { - this.imageStreamMapping = imageStreamMapping; - } - - @JsonProperty("ImageStreamTagList") - public ImageStreamTagList getImageStreamTagList() { - return imageStreamTagList; - } - - @JsonProperty("ImageStreamTagList") - public void setImageStreamTagList(ImageStreamTagList imageStreamTagList) { - this.imageStreamTagList = imageStreamTagList; - } - - @JsonProperty("ImageTag") - public ImageTag getImageTag() { - return imageTag; - } - - @JsonProperty("ImageTag") - public void setImageTag(ImageTag imageTag) { - this.imageTag = imageTag; - } - - @JsonProperty("ImageTagList") - public ImageTagList getImageTagList() { - return imageTagList; - } - - @JsonProperty("ImageTagList") - public void setImageTagList(ImageTagList imageTagList) { - this.imageTagList = imageTagList; - } - - @JsonProperty("Info") - public Info getInfo() { - return info; - } - - @JsonProperty("Info") - public void setInfo(Info info) { - this.info = info; - } - - @JsonProperty("ListOptions") - public ListOptions getListOptions() { - return listOptions; - } - - @JsonProperty("ListOptions") - public void setListOptions(ListOptions listOptions) { - this.listOptions = listOptions; - } - - @JsonProperty("LocalResourceAccessReview") - public LocalResourceAccessReview getLocalResourceAccessReview() { - return localResourceAccessReview; - } - - @JsonProperty("LocalResourceAccessReview") - public void setLocalResourceAccessReview(LocalResourceAccessReview localResourceAccessReview) { - this.localResourceAccessReview = localResourceAccessReview; - } - - @JsonProperty("LocalSubjectAccessReview") - public LocalSubjectAccessReview getLocalSubjectAccessReview() { - return localSubjectAccessReview; - } - - @JsonProperty("LocalSubjectAccessReview") - public void setLocalSubjectAccessReview(LocalSubjectAccessReview localSubjectAccessReview) { - this.localSubjectAccessReview = localSubjectAccessReview; - } - - @JsonProperty("NetNamespace") - public NetNamespace getNetNamespace() { - return netNamespace; - } - - @JsonProperty("NetNamespace") - public void setNetNamespace(NetNamespace netNamespace) { - this.netNamespace = netNamespace; - } - - @JsonProperty("NetNamespaceList") - public NetNamespaceList getNetNamespaceList() { - return netNamespaceList; - } - - @JsonProperty("NetNamespaceList") - public void setNetNamespaceList(NetNamespaceList netNamespaceList) { - this.netNamespaceList = netNamespaceList; - } - - @JsonProperty("OAuthAccessToken") - public OAuthAccessToken getOAuthAccessToken() { - return oAuthAccessToken; - } - - @JsonProperty("OAuthAccessToken") - public void setOAuthAccessToken(OAuthAccessToken oAuthAccessToken) { - this.oAuthAccessToken = oAuthAccessToken; - } - - @JsonProperty("OAuthAccessTokenList") - public OAuthAccessTokenList getOAuthAccessTokenList() { - return oAuthAccessTokenList; - } - - @JsonProperty("OAuthAccessTokenList") - public void setOAuthAccessTokenList(OAuthAccessTokenList oAuthAccessTokenList) { - this.oAuthAccessTokenList = oAuthAccessTokenList; - } - - @JsonProperty("OAuthAuthorizeToken") - public OAuthAuthorizeToken getOAuthAuthorizeToken() { - return oAuthAuthorizeToken; - } - - @JsonProperty("OAuthAuthorizeToken") - public void setOAuthAuthorizeToken(OAuthAuthorizeToken oAuthAuthorizeToken) { - this.oAuthAuthorizeToken = oAuthAuthorizeToken; - } - - @JsonProperty("OAuthAuthorizeTokenList") - public OAuthAuthorizeTokenList getOAuthAuthorizeTokenList() { - return oAuthAuthorizeTokenList; - } - - @JsonProperty("OAuthAuthorizeTokenList") - public void setOAuthAuthorizeTokenList(OAuthAuthorizeTokenList oAuthAuthorizeTokenList) { - this.oAuthAuthorizeTokenList = oAuthAuthorizeTokenList; - } - - @JsonProperty("OAuthClient") - public OAuthClient getOAuthClient() { - return oAuthClient; - } - - @JsonProperty("OAuthClient") - public void setOAuthClient(OAuthClient oAuthClient) { - this.oAuthClient = oAuthClient; - } - - @JsonProperty("OAuthClientAuthorization") - public OAuthClientAuthorization getOAuthClientAuthorization() { - return oAuthClientAuthorization; - } - - @JsonProperty("OAuthClientAuthorization") - public void setOAuthClientAuthorization(OAuthClientAuthorization oAuthClientAuthorization) { - this.oAuthClientAuthorization = oAuthClientAuthorization; - } - - @JsonProperty("OAuthClientAuthorizationList") - public OAuthClientAuthorizationList getOAuthClientAuthorizationList() { - return oAuthClientAuthorizationList; - } - - @JsonProperty("OAuthClientAuthorizationList") - public void setOAuthClientAuthorizationList(OAuthClientAuthorizationList oAuthClientAuthorizationList) { - this.oAuthClientAuthorizationList = oAuthClientAuthorizationList; - } - - @JsonProperty("OAuthClientList") - public OAuthClientList getOAuthClientList() { - return oAuthClientList; - } - - @JsonProperty("OAuthClientList") - public void setOAuthClientList(OAuthClientList oAuthClientList) { - this.oAuthClientList = oAuthClientList; - } - - @JsonProperty("ObjectMeta") - public ObjectMeta getObjectMeta() { - return objectMeta; - } - - @JsonProperty("ObjectMeta") - public void setObjectMeta(ObjectMeta objectMeta) { - this.objectMeta = objectMeta; - } - - @JsonProperty("OpenShiftRoleBindingRestrictionList") - public RoleBindingRestrictionList getOpenShiftRoleBindingRestrictionList() { - return openShiftRoleBindingRestrictionList; - } - - @JsonProperty("OpenShiftRoleBindingRestrictionList") - public void setOpenShiftRoleBindingRestrictionList(RoleBindingRestrictionList openShiftRoleBindingRestrictionList) { - this.openShiftRoleBindingRestrictionList = openShiftRoleBindingRestrictionList; - } - - @JsonProperty("OpenshiftClusterRole") - public ClusterRole getOpenshiftClusterRole() { - return openshiftClusterRole; - } - - @JsonProperty("OpenshiftClusterRole") - public void setOpenshiftClusterRole(ClusterRole openshiftClusterRole) { - this.openshiftClusterRole = openshiftClusterRole; - } - - @JsonProperty("OpenshiftClusterRoleBinding") - public ClusterRoleBinding getOpenshiftClusterRoleBinding() { - return openshiftClusterRoleBinding; - } - - @JsonProperty("OpenshiftClusterRoleBinding") - public void setOpenshiftClusterRoleBinding(ClusterRoleBinding openshiftClusterRoleBinding) { - this.openshiftClusterRoleBinding = openshiftClusterRoleBinding; - } - - @JsonProperty("OpenshiftClusterRoleBindingList") - public ClusterRoleBindingList getOpenshiftClusterRoleBindingList() { - return openshiftClusterRoleBindingList; - } - - @JsonProperty("OpenshiftClusterRoleBindingList") - public void setOpenshiftClusterRoleBindingList(ClusterRoleBindingList openshiftClusterRoleBindingList) { - this.openshiftClusterRoleBindingList = openshiftClusterRoleBindingList; - } - - @JsonProperty("OpenshiftClusterRoleList") - public ClusterRoleList getOpenshiftClusterRoleList() { - return openshiftClusterRoleList; - } - - @JsonProperty("OpenshiftClusterRoleList") - public void setOpenshiftClusterRoleList(ClusterRoleList openshiftClusterRoleList) { - this.openshiftClusterRoleList = openshiftClusterRoleList; - } - - @JsonProperty("OpenshiftClusterRoleScopeRestriction") - public ClusterRoleScopeRestriction getOpenshiftClusterRoleScopeRestriction() { - return openshiftClusterRoleScopeRestriction; - } - - @JsonProperty("OpenshiftClusterRoleScopeRestriction") - public void setOpenshiftClusterRoleScopeRestriction(ClusterRoleScopeRestriction openshiftClusterRoleScopeRestriction) { - this.openshiftClusterRoleScopeRestriction = openshiftClusterRoleScopeRestriction; - } - - @JsonProperty("OpenshiftRole") - public Role getOpenshiftRole() { - return openshiftRole; - } - - @JsonProperty("OpenshiftRole") - public void setOpenshiftRole(Role openshiftRole) { - this.openshiftRole = openshiftRole; - } - - @JsonProperty("OpenshiftRoleBinding") - public RoleBinding getOpenshiftRoleBinding() { - return openshiftRoleBinding; - } - - @JsonProperty("OpenshiftRoleBinding") - public void setOpenshiftRoleBinding(RoleBinding openshiftRoleBinding) { - this.openshiftRoleBinding = openshiftRoleBinding; - } - - @JsonProperty("OpenshiftRoleBindingList") - public RoleBindingList getOpenshiftRoleBindingList() { - return openshiftRoleBindingList; - } - - @JsonProperty("OpenshiftRoleBindingList") - public void setOpenshiftRoleBindingList(RoleBindingList openshiftRoleBindingList) { - this.openshiftRoleBindingList = openshiftRoleBindingList; - } - - @JsonProperty("OpenshiftRoleBindingRestriction") - public RoleBindingRestriction getOpenshiftRoleBindingRestriction() { - return openshiftRoleBindingRestriction; - } - - @JsonProperty("OpenshiftRoleBindingRestriction") - public void setOpenshiftRoleBindingRestriction(RoleBindingRestriction openshiftRoleBindingRestriction) { - this.openshiftRoleBindingRestriction = openshiftRoleBindingRestriction; - } - - @JsonProperty("OpenshiftRoleBindingRestrictionSpec") - public RoleBindingRestrictionSpec getOpenshiftRoleBindingRestrictionSpec() { - return openshiftRoleBindingRestrictionSpec; - } - - @JsonProperty("OpenshiftRoleBindingRestrictionSpec") - public void setOpenshiftRoleBindingRestrictionSpec(RoleBindingRestrictionSpec openshiftRoleBindingRestrictionSpec) { - this.openshiftRoleBindingRestrictionSpec = openshiftRoleBindingRestrictionSpec; - } - - @JsonProperty("OpenshiftRoleList") - public RoleList getOpenshiftRoleList() { - return openshiftRoleList; - } - - @JsonProperty("OpenshiftRoleList") - public void setOpenshiftRoleList(RoleList openshiftRoleList) { - this.openshiftRoleList = openshiftRoleList; - } - - @JsonProperty("Patch") - public Patch getPatch() { - return patch; - } - - @JsonProperty("Patch") - public void setPatch(Patch patch) { - this.patch = patch; - } - - @JsonProperty("PatchOptions") - public PatchOptions getPatchOptions() { - return patchOptions; - } - - @JsonProperty("PatchOptions") - public void setPatchOptions(PatchOptions patchOptions) { - this.patchOptions = patchOptions; - } - - @JsonProperty("PodSecurityPolicyReview") - public PodSecurityPolicyReview getPodSecurityPolicyReview() { - return podSecurityPolicyReview; - } - - @JsonProperty("PodSecurityPolicyReview") - public void setPodSecurityPolicyReview(PodSecurityPolicyReview podSecurityPolicyReview) { - this.podSecurityPolicyReview = podSecurityPolicyReview; - } - - @JsonProperty("PodSecurityPolicySelfSubjectReview") - public PodSecurityPolicySelfSubjectReview getPodSecurityPolicySelfSubjectReview() { - return podSecurityPolicySelfSubjectReview; - } - - @JsonProperty("PodSecurityPolicySelfSubjectReview") - public void setPodSecurityPolicySelfSubjectReview(PodSecurityPolicySelfSubjectReview podSecurityPolicySelfSubjectReview) { - this.podSecurityPolicySelfSubjectReview = podSecurityPolicySelfSubjectReview; - } - - @JsonProperty("PodSecurityPolicySubjectReview") - public PodSecurityPolicySubjectReview getPodSecurityPolicySubjectReview() { - return podSecurityPolicySubjectReview; - } - - @JsonProperty("PodSecurityPolicySubjectReview") - public void setPodSecurityPolicySubjectReview(PodSecurityPolicySubjectReview podSecurityPolicySubjectReview) { - this.podSecurityPolicySubjectReview = podSecurityPolicySubjectReview; - } - - @JsonProperty("Project") - public Project getProject() { - return project; - } - - @JsonProperty("Project") - public void setProject(Project project) { - this.project = project; - } - - @JsonProperty("ProjectHelmChartRepository") - public ProjectHelmChartRepository getProjectHelmChartRepository() { - return projectHelmChartRepository; - } - - @JsonProperty("ProjectHelmChartRepository") - public void setProjectHelmChartRepository(ProjectHelmChartRepository projectHelmChartRepository) { - this.projectHelmChartRepository = projectHelmChartRepository; - } - - @JsonProperty("ProjectHelmChartRepositoryList") - public ProjectHelmChartRepositoryList getProjectHelmChartRepositoryList() { - return projectHelmChartRepositoryList; - } - - @JsonProperty("ProjectHelmChartRepositoryList") - public void setProjectHelmChartRepositoryList(ProjectHelmChartRepositoryList projectHelmChartRepositoryList) { - this.projectHelmChartRepositoryList = projectHelmChartRepositoryList; - } - - @JsonProperty("ProjectList") - public ProjectList getProjectList() { - return projectList; - } - - @JsonProperty("ProjectList") - public void setProjectList(ProjectList projectList) { - this.projectList = projectList; - } - - @JsonProperty("ProjectRequest") - public ProjectRequest getProjectRequest() { - return projectRequest; - } - - @JsonProperty("ProjectRequest") - public void setProjectRequest(ProjectRequest projectRequest) { - this.projectRequest = projectRequest; - } - - @JsonProperty("Quantity") - public Quantity getQuantity() { - return quantity; - } - - @JsonProperty("Quantity") - public void setQuantity(Quantity quantity) { - this.quantity = quantity; - } - - @JsonProperty("RangeAllocation") - public RangeAllocation getRangeAllocation() { - return rangeAllocation; - } - - @JsonProperty("RangeAllocation") - public void setRangeAllocation(RangeAllocation rangeAllocation) { - this.rangeAllocation = rangeAllocation; - } - - @JsonProperty("RangeAllocationList") - public RangeAllocationList getRangeAllocationList() { - return rangeAllocationList; - } - - @JsonProperty("RangeAllocationList") - public void setRangeAllocationList(RangeAllocationList rangeAllocationList) { - this.rangeAllocationList = rangeAllocationList; - } - - @JsonProperty("ResourceAccessReview") - public ResourceAccessReview getResourceAccessReview() { - return resourceAccessReview; - } - - @JsonProperty("ResourceAccessReview") - public void setResourceAccessReview(ResourceAccessReview resourceAccessReview) { - this.resourceAccessReview = resourceAccessReview; - } - - @JsonProperty("ResourceAccessReviewResponse") - public ResourceAccessReviewResponse getResourceAccessReviewResponse() { - return resourceAccessReviewResponse; - } - - @JsonProperty("ResourceAccessReviewResponse") - public void setResourceAccessReviewResponse(ResourceAccessReviewResponse resourceAccessReviewResponse) { - this.resourceAccessReviewResponse = resourceAccessReviewResponse; - } - - @JsonProperty("RootPaths") - public RootPaths getRootPaths() { - return rootPaths; - } - - @JsonProperty("RootPaths") - public void setRootPaths(RootPaths rootPaths) { - this.rootPaths = rootPaths; - } - - @JsonProperty("Route") - public Route getRoute() { - return route; - } - - @JsonProperty("Route") - public void setRoute(Route route) { - this.route = route; - } - - @JsonProperty("RouteList") - public RouteList getRouteList() { - return routeList; - } - - @JsonProperty("RouteList") - public void setRouteList(RouteList routeList) { - this.routeList = routeList; - } - - @JsonProperty("SecurityContextConstraints") - public SecurityContextConstraints getSecurityContextConstraints() { - return securityContextConstraints; - } - - @JsonProperty("SecurityContextConstraints") - public void setSecurityContextConstraints(SecurityContextConstraints securityContextConstraints) { - this.securityContextConstraints = securityContextConstraints; - } - - @JsonProperty("SecurityContextConstraintsList") - public SecurityContextConstraintsList getSecurityContextConstraintsList() { - return securityContextConstraintsList; - } - - @JsonProperty("SecurityContextConstraintsList") - public void setSecurityContextConstraintsList(SecurityContextConstraintsList securityContextConstraintsList) { - this.securityContextConstraintsList = securityContextConstraintsList; - } - - @JsonProperty("SelfSubjectRulesReview") - public SelfSubjectRulesReview getSelfSubjectRulesReview() { - return selfSubjectRulesReview; - } - - @JsonProperty("SelfSubjectRulesReview") - public void setSelfSubjectRulesReview(SelfSubjectRulesReview selfSubjectRulesReview) { - this.selfSubjectRulesReview = selfSubjectRulesReview; - } - - @JsonProperty("Status") - public Status getStatus() { - return status; - } - - @JsonProperty("Status") - public void setStatus(Status status) { - this.status = status; - } - - @JsonProperty("SubjectAccessReview") - public SubjectAccessReview getSubjectAccessReview() { - return subjectAccessReview; - } - - @JsonProperty("SubjectAccessReview") - public void setSubjectAccessReview(SubjectAccessReview subjectAccessReview) { - this.subjectAccessReview = subjectAccessReview; - } - - @JsonProperty("SubjectAccessReviewResponse") - public SubjectAccessReviewResponse getSubjectAccessReviewResponse() { - return subjectAccessReviewResponse; - } - - @JsonProperty("SubjectAccessReviewResponse") - public void setSubjectAccessReviewResponse(SubjectAccessReviewResponse subjectAccessReviewResponse) { - this.subjectAccessReviewResponse = subjectAccessReviewResponse; - } - - @JsonProperty("SubjectRulesReview") - public SubjectRulesReview getSubjectRulesReview() { - return subjectRulesReview; - } - - @JsonProperty("SubjectRulesReview") - public void setSubjectRulesReview(SubjectRulesReview subjectRulesReview) { - this.subjectRulesReview = subjectRulesReview; - } - - @JsonProperty("TagEvent") - public TagEvent getTagEvent() { - return tagEvent; - } - - @JsonProperty("TagEvent") - public void setTagEvent(TagEvent tagEvent) { - this.tagEvent = tagEvent; - } - - @JsonProperty("Template") - public Template getTemplate() { - return template; - } - - @JsonProperty("Template") - public void setTemplate(Template template) { - this.template = template; - } - - @JsonProperty("TemplateInstance") - public TemplateInstance getTemplateInstance() { - return templateInstance; - } - - @JsonProperty("TemplateInstance") - public void setTemplateInstance(TemplateInstance templateInstance) { - this.templateInstance = templateInstance; - } - - @JsonProperty("TemplateInstanceList") - public TemplateInstanceList getTemplateInstanceList() { - return templateInstanceList; - } - - @JsonProperty("TemplateInstanceList") - public void setTemplateInstanceList(TemplateInstanceList templateInstanceList) { - this.templateInstanceList = templateInstanceList; - } - - @JsonProperty("TemplateList") - public TemplateList getTemplateList() { - return templateList; - } - - @JsonProperty("TemplateList") - public void setTemplateList(TemplateList templateList) { - this.templateList = templateList; - } - - @JsonProperty("Time") - public String getTime() { - return time; - } - - @JsonProperty("Time") - public void setTime(String time) { - this.time = time; - } - - @JsonProperty("TokenReview") - public TokenReview getTokenReview() { - return tokenReview; - } - - @JsonProperty("TokenReview") - public void setTokenReview(TokenReview tokenReview) { - this.tokenReview = tokenReview; - } - - @JsonProperty("TypeMeta") - public TypeMeta getTypeMeta() { - return typeMeta; - } - - @JsonProperty("TypeMeta") - public void setTypeMeta(TypeMeta typeMeta) { - this.typeMeta = typeMeta; - } - - @JsonProperty("UpdateOptions") - public UpdateOptions getUpdateOptions() { - return updateOptions; - } - - @JsonProperty("UpdateOptions") - public void setUpdateOptions(UpdateOptions updateOptions) { - this.updateOptions = updateOptions; - } - - @JsonProperty("User") - public User getUser() { - return user; - } - - @JsonProperty("User") - public void setUser(User user) { - this.user = user; - } - - @JsonProperty("UserIdentityMapping") - public UserIdentityMapping getUserIdentityMapping() { - return userIdentityMapping; - } - - @JsonProperty("UserIdentityMapping") - public void setUserIdentityMapping(UserIdentityMapping userIdentityMapping) { - this.userIdentityMapping = userIdentityMapping; - } - - @JsonProperty("UserList") - public UserList getUserList() { - return userList; - } - - @JsonProperty("UserList") - public void setUserList(UserList userList) { - this.userList = userList; - } - - @JsonProperty("UserOAuthAccessToken") - public UserOAuthAccessToken getUserOAuthAccessToken() { - return userOAuthAccessToken; - } - - @JsonProperty("UserOAuthAccessToken") - public void setUserOAuthAccessToken(UserOAuthAccessToken userOAuthAccessToken) { - this.userOAuthAccessToken = userOAuthAccessToken; - } - - @JsonProperty("UserOAuthAccessTokenList") - public UserOAuthAccessTokenList getUserOAuthAccessTokenList() { - return userOAuthAccessTokenList; - } - - @JsonProperty("UserOAuthAccessTokenList") - public void setUserOAuthAccessTokenList(UserOAuthAccessTokenList userOAuthAccessTokenList) { - this.userOAuthAccessTokenList = userOAuthAccessTokenList; - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java deleted file mode 100644 index 0913d66155c..00000000000 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ /dev/null @@ -1,1417 +0,0 @@ - -package io.fabric8.kubernetes.api.model; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; -import io.fabric8.kubernetes.api.model.authentication.TokenReview; -import io.fabric8.kubernetes.api.model.rbac.AggregationRule; -import io.fabric8.kubernetes.api.model.version.Info; -import io.fabric8.openshift.api.model.AppliedClusterResourceQuota; -import io.fabric8.openshift.api.model.AppliedClusterResourceQuotaList; -import io.fabric8.openshift.api.model.BrokerTemplateInstance; -import io.fabric8.openshift.api.model.BrokerTemplateInstanceList; -import io.fabric8.openshift.api.model.BuildConfigList; -import io.fabric8.openshift.api.model.BuildList; -import io.fabric8.openshift.api.model.BuildRequest; -import io.fabric8.openshift.api.model.ClusterNetwork; -import io.fabric8.openshift.api.model.ClusterNetworkList; -import io.fabric8.openshift.api.model.ClusterResourceQuota; -import io.fabric8.openshift.api.model.ClusterResourceQuotaList; -import io.fabric8.openshift.api.model.ClusterRole; -import io.fabric8.openshift.api.model.ClusterRoleBinding; -import io.fabric8.openshift.api.model.ClusterRoleBindingList; -import io.fabric8.openshift.api.model.ClusterRoleList; -import io.fabric8.openshift.api.model.ClusterRoleScopeRestriction; -import io.fabric8.openshift.api.model.DeploymentConfig; -import io.fabric8.openshift.api.model.DeploymentConfigList; -import io.fabric8.openshift.api.model.DeploymentConfigRollback; -import io.fabric8.openshift.api.model.EgressNetworkPolicy; -import io.fabric8.openshift.api.model.EgressNetworkPolicyList; -import io.fabric8.openshift.api.model.Group; -import io.fabric8.openshift.api.model.GroupList; -import io.fabric8.openshift.api.model.HelmChartRepository; -import io.fabric8.openshift.api.model.HelmChartRepositoryList; -import io.fabric8.openshift.api.model.HostSubnet; -import io.fabric8.openshift.api.model.HostSubnetList; -import io.fabric8.openshift.api.model.Identity; -import io.fabric8.openshift.api.model.IdentityList; -import io.fabric8.openshift.api.model.ImageList; -import io.fabric8.openshift.api.model.ImageSignature; -import io.fabric8.openshift.api.model.ImageStreamImage; -import io.fabric8.openshift.api.model.ImageStreamImport; -import io.fabric8.openshift.api.model.ImageStreamList; -import io.fabric8.openshift.api.model.ImageStreamMapping; -import io.fabric8.openshift.api.model.ImageStreamTagList; -import io.fabric8.openshift.api.model.ImageTag; -import io.fabric8.openshift.api.model.ImageTagList; -import io.fabric8.openshift.api.model.LocalResourceAccessReview; -import io.fabric8.openshift.api.model.LocalSubjectAccessReview; -import io.fabric8.openshift.api.model.NetNamespace; -import io.fabric8.openshift.api.model.NetNamespaceList; -import io.fabric8.openshift.api.model.OAuthAccessToken; -import io.fabric8.openshift.api.model.OAuthAccessTokenList; -import io.fabric8.openshift.api.model.OAuthAuthorizeToken; -import io.fabric8.openshift.api.model.OAuthAuthorizeTokenList; -import io.fabric8.openshift.api.model.OAuthClient; -import io.fabric8.openshift.api.model.OAuthClientAuthorization; -import io.fabric8.openshift.api.model.OAuthClientAuthorizationList; -import io.fabric8.openshift.api.model.OAuthClientList; -import io.fabric8.openshift.api.model.PodSecurityPolicyReview; -import io.fabric8.openshift.api.model.PodSecurityPolicySelfSubjectReview; -import io.fabric8.openshift.api.model.PodSecurityPolicySubjectReview; -import io.fabric8.openshift.api.model.Project; -import io.fabric8.openshift.api.model.ProjectHelmChartRepository; -import io.fabric8.openshift.api.model.ProjectHelmChartRepositoryList; -import io.fabric8.openshift.api.model.ProjectList; -import io.fabric8.openshift.api.model.ProjectRequest; -import io.fabric8.openshift.api.model.RangeAllocation; -import io.fabric8.openshift.api.model.RangeAllocationList; -import io.fabric8.openshift.api.model.ResourceAccessReview; -import io.fabric8.openshift.api.model.ResourceAccessReviewResponse; -import io.fabric8.openshift.api.model.Role; -import io.fabric8.openshift.api.model.RoleBinding; -import io.fabric8.openshift.api.model.RoleBindingList; -import io.fabric8.openshift.api.model.RoleBindingRestriction; -import io.fabric8.openshift.api.model.RoleBindingRestrictionList; -import io.fabric8.openshift.api.model.RoleBindingRestrictionSpec; -import io.fabric8.openshift.api.model.RoleList; -import io.fabric8.openshift.api.model.Route; -import io.fabric8.openshift.api.model.RouteList; -import io.fabric8.openshift.api.model.SecurityContextConstraints; -import io.fabric8.openshift.api.model.SecurityContextConstraintsList; -import io.fabric8.openshift.api.model.SelfSubjectRulesReview; -import io.fabric8.openshift.api.model.SubjectAccessReview; -import io.fabric8.openshift.api.model.SubjectAccessReviewResponse; -import io.fabric8.openshift.api.model.SubjectRulesReview; -import io.fabric8.openshift.api.model.TagEvent; -import io.fabric8.openshift.api.model.Template; -import io.fabric8.openshift.api.model.TemplateInstance; -import io.fabric8.openshift.api.model.TemplateInstanceList; -import io.fabric8.openshift.api.model.TemplateList; -import io.fabric8.openshift.api.model.User; -import io.fabric8.openshift.api.model.UserIdentityMapping; -import io.fabric8.openshift.api.model.UserList; -import io.fabric8.openshift.api.model.UserOAuthAccessToken; -import io.fabric8.openshift.api.model.UserOAuthAccessTokenList; - -@Generated("jsonschema2pojo") -public class ValidationSchema { - - private APIGroup aPIGroup; - private APIGroupList aPIGroupList; - private AggregationRule aggregationRule; - private AppliedClusterResourceQuota appliedClusterResourceQuota; - private AppliedClusterResourceQuotaList appliedClusterResourceQuotaList; - private KubernetesList baseKubernetesList; - private BrokerTemplateInstance brokerTemplateInstance; - private BrokerTemplateInstanceList brokerTemplateInstanceList; - private BuildConfigList buildConfigList; - private BuildList buildList; - private BuildRequest buildRequest; - private ClusterNetwork clusterNetwork; - private ClusterNetworkList clusterNetworkList; - private ClusterResourceQuota clusterResourceQuota; - private ClusterResourceQuotaList clusterResourceQuotaList; - private Config config; - private CreateOptions createOptions; - private DeleteOptions deleteOptions; - private DeploymentConfig deploymentConfig; - private DeploymentConfigList deploymentConfigList; - private DeploymentConfigRollback deploymentConfigRollback; - private EgressNetworkPolicy egressNetworkPolicy; - private EgressNetworkPolicyList egressNetworkPolicyList; - private GetOptions getOptions; - private Group group; - private GroupList groupList; - private HelmChartRepository helmChartRepository; - private HelmChartRepositoryList helmChartRepositoryList; - private HostSubnet hostSubnet; - private HostSubnetList hostSubnetList; - private Identity identity; - private IdentityList identityList; - private ImageList imageList; - private ImageSignature imageSignature; - private ImageStreamImage imageStreamImage; - private ImageStreamImport imageStreamImport; - private ImageStreamList imageStreamList; - private ImageStreamMapping imageStreamMapping; - private ImageStreamTagList imageStreamTagList; - private ImageTag imageTag; - private ImageTagList imageTagList; - private Info info; - private ListOptions listOptions; - private LocalResourceAccessReview localResourceAccessReview; - private LocalSubjectAccessReview localSubjectAccessReview; - private NetNamespace netNamespace; - private NetNamespaceList netNamespaceList; - private OAuthAccessToken oAuthAccessToken; - private OAuthAccessTokenList oAuthAccessTokenList; - private OAuthAuthorizeToken oAuthAuthorizeToken; - private OAuthAuthorizeTokenList oAuthAuthorizeTokenList; - private OAuthClient oAuthClient; - private OAuthClientAuthorization oAuthClientAuthorization; - private OAuthClientAuthorizationList oAuthClientAuthorizationList; - private OAuthClientList oAuthClientList; - private ObjectMeta objectMeta; - private RoleBindingRestrictionList openShiftRoleBindingRestrictionList; - private ClusterRole openshiftClusterRole; - private ClusterRoleBinding openshiftClusterRoleBinding; - private ClusterRoleBindingList openshiftClusterRoleBindingList; - private ClusterRoleList openshiftClusterRoleList; - private ClusterRoleScopeRestriction openshiftClusterRoleScopeRestriction; - private Role openshiftRole; - private RoleBinding openshiftRoleBinding; - private RoleBindingList openshiftRoleBindingList; - private RoleBindingRestriction openshiftRoleBindingRestriction; - private RoleBindingRestrictionSpec openshiftRoleBindingRestrictionSpec; - private RoleList openshiftRoleList; - private Patch patch; - private PatchOptions patchOptions; - private PodSecurityPolicyReview podSecurityPolicyReview; - private PodSecurityPolicySelfSubjectReview podSecurityPolicySelfSubjectReview; - private PodSecurityPolicySubjectReview podSecurityPolicySubjectReview; - private Project project; - private ProjectHelmChartRepository projectHelmChartRepository; - private ProjectHelmChartRepositoryList projectHelmChartRepositoryList; - private ProjectList projectList; - private ProjectRequest projectRequest; - private Quantity quantity; - private RangeAllocation rangeAllocation; - private RangeAllocationList rangeAllocationList; - private ResourceAccessReview resourceAccessReview; - private ResourceAccessReviewResponse resourceAccessReviewResponse; - private RootPaths rootPaths; - private Route route; - private RouteList routeList; - private SecurityContextConstraints securityContextConstraints; - private SecurityContextConstraintsList securityContextConstraintsList; - private SelfSubjectRulesReview selfSubjectRulesReview; - private Status status; - private SubjectAccessReview subjectAccessReview; - private SubjectAccessReviewResponse subjectAccessReviewResponse; - private SubjectRulesReview subjectRulesReview; - private TagEvent tagEvent; - private Template template; - private TemplateInstance templateInstance; - private TemplateInstanceList templateInstanceList; - private TemplateList templateList; - private String time; - private TokenReview tokenReview; - private TypeMeta typeMeta; - private UpdateOptions updateOptions; - private User user; - private UserIdentityMapping userIdentityMapping; - private UserList userList; - private UserOAuthAccessToken userOAuthAccessToken; - private UserOAuthAccessTokenList userOAuthAccessTokenList; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ValidationSchema() { - } - - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, AggregationRule aggregationRule, AppliedClusterResourceQuota appliedClusterResourceQuota, AppliedClusterResourceQuotaList appliedClusterResourceQuotaList, KubernetesList baseKubernetesList, BrokerTemplateInstance brokerTemplateInstance, BrokerTemplateInstanceList brokerTemplateInstanceList, BuildConfigList buildConfigList, BuildList buildList, BuildRequest buildRequest, ClusterNetwork clusterNetwork, ClusterNetworkList clusterNetworkList, ClusterResourceQuota clusterResourceQuota, ClusterResourceQuotaList clusterResourceQuotaList, Config config, CreateOptions createOptions, DeleteOptions deleteOptions, DeploymentConfig deploymentConfig, DeploymentConfigList deploymentConfigList, DeploymentConfigRollback deploymentConfigRollback, EgressNetworkPolicy egressNetworkPolicy, EgressNetworkPolicyList egressNetworkPolicyList, GetOptions getOptions, Group group, GroupList groupList, HelmChartRepository helmChartRepository, HelmChartRepositoryList helmChartRepositoryList, HostSubnet hostSubnet, HostSubnetList hostSubnetList, Identity identity, IdentityList identityList, ImageList imageList, ImageSignature imageSignature, ImageStreamImage imageStreamImage, ImageStreamImport imageStreamImport, ImageStreamList imageStreamList, ImageStreamMapping imageStreamMapping, ImageStreamTagList imageStreamTagList, ImageTag imageTag, ImageTagList imageTagList, Info info, ListOptions listOptions, LocalResourceAccessReview localResourceAccessReview, LocalSubjectAccessReview localSubjectAccessReview, NetNamespace netNamespace, NetNamespaceList netNamespaceList, OAuthAccessToken oAuthAccessToken, OAuthAccessTokenList oAuthAccessTokenList, OAuthAuthorizeToken oAuthAuthorizeToken, OAuthAuthorizeTokenList oAuthAuthorizeTokenList, OAuthClient oAuthClient, OAuthClientAuthorization oAuthClientAuthorization, OAuthClientAuthorizationList oAuthClientAuthorizationList, OAuthClientList oAuthClientList, ObjectMeta objectMeta, RoleBindingRestrictionList openShiftRoleBindingRestrictionList, ClusterRole openshiftClusterRole, ClusterRoleBinding openshiftClusterRoleBinding, ClusterRoleBindingList openshiftClusterRoleBindingList, ClusterRoleList openshiftClusterRoleList, ClusterRoleScopeRestriction openshiftClusterRoleScopeRestriction, Role openshiftRole, RoleBinding openshiftRoleBinding, RoleBindingList openshiftRoleBindingList, RoleBindingRestriction openshiftRoleBindingRestriction, RoleBindingRestrictionSpec openshiftRoleBindingRestrictionSpec, RoleList openshiftRoleList, Patch patch, PatchOptions patchOptions, PodSecurityPolicyReview podSecurityPolicyReview, PodSecurityPolicySelfSubjectReview podSecurityPolicySelfSubjectReview, PodSecurityPolicySubjectReview podSecurityPolicySubjectReview, Project project, ProjectHelmChartRepository projectHelmChartRepository, ProjectHelmChartRepositoryList projectHelmChartRepositoryList, ProjectList projectList, ProjectRequest projectRequest, Quantity quantity, RangeAllocation rangeAllocation, RangeAllocationList rangeAllocationList, ResourceAccessReview resourceAccessReview, ResourceAccessReviewResponse resourceAccessReviewResponse, RootPaths rootPaths, Route route, RouteList routeList, SecurityContextConstraints securityContextConstraints, SecurityContextConstraintsList securityContextConstraintsList, SelfSubjectRulesReview selfSubjectRulesReview, Status status, SubjectAccessReview subjectAccessReview, SubjectAccessReviewResponse subjectAccessReviewResponse, SubjectRulesReview subjectRulesReview, TagEvent tagEvent, Template template, TemplateInstance templateInstance, TemplateInstanceList templateInstanceList, TemplateList templateList, String time, TokenReview tokenReview, TypeMeta typeMeta, UpdateOptions updateOptions, User user, UserIdentityMapping userIdentityMapping, UserList userList, UserOAuthAccessToken userOAuthAccessToken, UserOAuthAccessTokenList userOAuthAccessTokenList) { - super(); - this.aPIGroup = aPIGroup; - this.aPIGroupList = aPIGroupList; - this.aggregationRule = aggregationRule; - this.appliedClusterResourceQuota = appliedClusterResourceQuota; - this.appliedClusterResourceQuotaList = appliedClusterResourceQuotaList; - this.baseKubernetesList = baseKubernetesList; - this.brokerTemplateInstance = brokerTemplateInstance; - this.brokerTemplateInstanceList = brokerTemplateInstanceList; - this.buildConfigList = buildConfigList; - this.buildList = buildList; - this.buildRequest = buildRequest; - this.clusterNetwork = clusterNetwork; - this.clusterNetworkList = clusterNetworkList; - this.clusterResourceQuota = clusterResourceQuota; - this.clusterResourceQuotaList = clusterResourceQuotaList; - this.config = config; - this.createOptions = createOptions; - this.deleteOptions = deleteOptions; - this.deploymentConfig = deploymentConfig; - this.deploymentConfigList = deploymentConfigList; - this.deploymentConfigRollback = deploymentConfigRollback; - this.egressNetworkPolicy = egressNetworkPolicy; - this.egressNetworkPolicyList = egressNetworkPolicyList; - this.getOptions = getOptions; - this.group = group; - this.groupList = groupList; - this.helmChartRepository = helmChartRepository; - this.helmChartRepositoryList = helmChartRepositoryList; - this.hostSubnet = hostSubnet; - this.hostSubnetList = hostSubnetList; - this.identity = identity; - this.identityList = identityList; - this.imageList = imageList; - this.imageSignature = imageSignature; - this.imageStreamImage = imageStreamImage; - this.imageStreamImport = imageStreamImport; - this.imageStreamList = imageStreamList; - this.imageStreamMapping = imageStreamMapping; - this.imageStreamTagList = imageStreamTagList; - this.imageTag = imageTag; - this.imageTagList = imageTagList; - this.info = info; - this.listOptions = listOptions; - this.localResourceAccessReview = localResourceAccessReview; - this.localSubjectAccessReview = localSubjectAccessReview; - this.netNamespace = netNamespace; - this.netNamespaceList = netNamespaceList; - this.oAuthAccessToken = oAuthAccessToken; - this.oAuthAccessTokenList = oAuthAccessTokenList; - this.oAuthAuthorizeToken = oAuthAuthorizeToken; - this.oAuthAuthorizeTokenList = oAuthAuthorizeTokenList; - this.oAuthClient = oAuthClient; - this.oAuthClientAuthorization = oAuthClientAuthorization; - this.oAuthClientAuthorizationList = oAuthClientAuthorizationList; - this.oAuthClientList = oAuthClientList; - this.objectMeta = objectMeta; - this.openShiftRoleBindingRestrictionList = openShiftRoleBindingRestrictionList; - this.openshiftClusterRole = openshiftClusterRole; - this.openshiftClusterRoleBinding = openshiftClusterRoleBinding; - this.openshiftClusterRoleBindingList = openshiftClusterRoleBindingList; - this.openshiftClusterRoleList = openshiftClusterRoleList; - this.openshiftClusterRoleScopeRestriction = openshiftClusterRoleScopeRestriction; - this.openshiftRole = openshiftRole; - this.openshiftRoleBinding = openshiftRoleBinding; - this.openshiftRoleBindingList = openshiftRoleBindingList; - this.openshiftRoleBindingRestriction = openshiftRoleBindingRestriction; - this.openshiftRoleBindingRestrictionSpec = openshiftRoleBindingRestrictionSpec; - this.openshiftRoleList = openshiftRoleList; - this.patch = patch; - this.patchOptions = patchOptions; - this.podSecurityPolicyReview = podSecurityPolicyReview; - this.podSecurityPolicySelfSubjectReview = podSecurityPolicySelfSubjectReview; - this.podSecurityPolicySubjectReview = podSecurityPolicySubjectReview; - this.project = project; - this.projectHelmChartRepository = projectHelmChartRepository; - this.projectHelmChartRepositoryList = projectHelmChartRepositoryList; - this.projectList = projectList; - this.projectRequest = projectRequest; - this.quantity = quantity; - this.rangeAllocation = rangeAllocation; - this.rangeAllocationList = rangeAllocationList; - this.resourceAccessReview = resourceAccessReview; - this.resourceAccessReviewResponse = resourceAccessReviewResponse; - this.rootPaths = rootPaths; - this.route = route; - this.routeList = routeList; - this.securityContextConstraints = securityContextConstraints; - this.securityContextConstraintsList = securityContextConstraintsList; - this.selfSubjectRulesReview = selfSubjectRulesReview; - this.status = status; - this.subjectAccessReview = subjectAccessReview; - this.subjectAccessReviewResponse = subjectAccessReviewResponse; - this.subjectRulesReview = subjectRulesReview; - this.tagEvent = tagEvent; - this.template = template; - this.templateInstance = templateInstance; - this.templateInstanceList = templateInstanceList; - this.templateList = templateList; - this.time = time; - this.tokenReview = tokenReview; - this.typeMeta = typeMeta; - this.updateOptions = updateOptions; - this.user = user; - this.userIdentityMapping = userIdentityMapping; - this.userList = userList; - this.userOAuthAccessToken = userOAuthAccessToken; - this.userOAuthAccessTokenList = userOAuthAccessTokenList; - } - - @JsonProperty("APIGroup") - public APIGroup getAPIGroup() { - return aPIGroup; - } - - @JsonProperty("APIGroup") - public void setAPIGroup(APIGroup aPIGroup) { - this.aPIGroup = aPIGroup; - } - - @JsonProperty("APIGroupList") - public APIGroupList getAPIGroupList() { - return aPIGroupList; - } - - @JsonProperty("APIGroupList") - public void setAPIGroupList(APIGroupList aPIGroupList) { - this.aPIGroupList = aPIGroupList; - } - - @JsonProperty("AggregationRule") - public AggregationRule getAggregationRule() { - return aggregationRule; - } - - @JsonProperty("AggregationRule") - public void setAggregationRule(AggregationRule aggregationRule) { - this.aggregationRule = aggregationRule; - } - - @JsonProperty("AppliedClusterResourceQuota") - public AppliedClusterResourceQuota getAppliedClusterResourceQuota() { - return appliedClusterResourceQuota; - } - - @JsonProperty("AppliedClusterResourceQuota") - public void setAppliedClusterResourceQuota(AppliedClusterResourceQuota appliedClusterResourceQuota) { - this.appliedClusterResourceQuota = appliedClusterResourceQuota; - } - - @JsonProperty("AppliedClusterResourceQuotaList") - public AppliedClusterResourceQuotaList getAppliedClusterResourceQuotaList() { - return appliedClusterResourceQuotaList; - } - - @JsonProperty("AppliedClusterResourceQuotaList") - public void setAppliedClusterResourceQuotaList(AppliedClusterResourceQuotaList appliedClusterResourceQuotaList) { - this.appliedClusterResourceQuotaList = appliedClusterResourceQuotaList; - } - - @JsonProperty("BaseKubernetesList") - public KubernetesList getBaseKubernetesList() { - return baseKubernetesList; - } - - @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(KubernetesList baseKubernetesList) { - this.baseKubernetesList = baseKubernetesList; - } - - @JsonProperty("BrokerTemplateInstance") - public BrokerTemplateInstance getBrokerTemplateInstance() { - return brokerTemplateInstance; - } - - @JsonProperty("BrokerTemplateInstance") - public void setBrokerTemplateInstance(BrokerTemplateInstance brokerTemplateInstance) { - this.brokerTemplateInstance = brokerTemplateInstance; - } - - @JsonProperty("BrokerTemplateInstanceList") - public BrokerTemplateInstanceList getBrokerTemplateInstanceList() { - return brokerTemplateInstanceList; - } - - @JsonProperty("BrokerTemplateInstanceList") - public void setBrokerTemplateInstanceList(BrokerTemplateInstanceList brokerTemplateInstanceList) { - this.brokerTemplateInstanceList = brokerTemplateInstanceList; - } - - @JsonProperty("BuildConfigList") - public BuildConfigList getBuildConfigList() { - return buildConfigList; - } - - @JsonProperty("BuildConfigList") - public void setBuildConfigList(BuildConfigList buildConfigList) { - this.buildConfigList = buildConfigList; - } - - @JsonProperty("BuildList") - public BuildList getBuildList() { - return buildList; - } - - @JsonProperty("BuildList") - public void setBuildList(BuildList buildList) { - this.buildList = buildList; - } - - @JsonProperty("BuildRequest") - public BuildRequest getBuildRequest() { - return buildRequest; - } - - @JsonProperty("BuildRequest") - public void setBuildRequest(BuildRequest buildRequest) { - this.buildRequest = buildRequest; - } - - @JsonProperty("ClusterNetwork") - public ClusterNetwork getClusterNetwork() { - return clusterNetwork; - } - - @JsonProperty("ClusterNetwork") - public void setClusterNetwork(ClusterNetwork clusterNetwork) { - this.clusterNetwork = clusterNetwork; - } - - @JsonProperty("ClusterNetworkList") - public ClusterNetworkList getClusterNetworkList() { - return clusterNetworkList; - } - - @JsonProperty("ClusterNetworkList") - public void setClusterNetworkList(ClusterNetworkList clusterNetworkList) { - this.clusterNetworkList = clusterNetworkList; - } - - @JsonProperty("ClusterResourceQuota") - public ClusterResourceQuota getClusterResourceQuota() { - return clusterResourceQuota; - } - - @JsonProperty("ClusterResourceQuota") - public void setClusterResourceQuota(ClusterResourceQuota clusterResourceQuota) { - this.clusterResourceQuota = clusterResourceQuota; - } - - @JsonProperty("ClusterResourceQuotaList") - public ClusterResourceQuotaList getClusterResourceQuotaList() { - return clusterResourceQuotaList; - } - - @JsonProperty("ClusterResourceQuotaList") - public void setClusterResourceQuotaList(ClusterResourceQuotaList clusterResourceQuotaList) { - this.clusterResourceQuotaList = clusterResourceQuotaList; - } - - @JsonProperty("Config") - public Config getConfig() { - return config; - } - - @JsonProperty("Config") - public void setConfig(Config config) { - this.config = config; - } - - @JsonProperty("CreateOptions") - public CreateOptions getCreateOptions() { - return createOptions; - } - - @JsonProperty("CreateOptions") - public void setCreateOptions(CreateOptions createOptions) { - this.createOptions = createOptions; - } - - @JsonProperty("DeleteOptions") - public DeleteOptions getDeleteOptions() { - return deleteOptions; - } - - @JsonProperty("DeleteOptions") - public void setDeleteOptions(DeleteOptions deleteOptions) { - this.deleteOptions = deleteOptions; - } - - @JsonProperty("DeploymentConfig") - public DeploymentConfig getDeploymentConfig() { - return deploymentConfig; - } - - @JsonProperty("DeploymentConfig") - public void setDeploymentConfig(DeploymentConfig deploymentConfig) { - this.deploymentConfig = deploymentConfig; - } - - @JsonProperty("DeploymentConfigList") - public DeploymentConfigList getDeploymentConfigList() { - return deploymentConfigList; - } - - @JsonProperty("DeploymentConfigList") - public void setDeploymentConfigList(DeploymentConfigList deploymentConfigList) { - this.deploymentConfigList = deploymentConfigList; - } - - @JsonProperty("DeploymentConfigRollback") - public DeploymentConfigRollback getDeploymentConfigRollback() { - return deploymentConfigRollback; - } - - @JsonProperty("DeploymentConfigRollback") - public void setDeploymentConfigRollback(DeploymentConfigRollback deploymentConfigRollback) { - this.deploymentConfigRollback = deploymentConfigRollback; - } - - @JsonProperty("EgressNetworkPolicy") - public EgressNetworkPolicy getEgressNetworkPolicy() { - return egressNetworkPolicy; - } - - @JsonProperty("EgressNetworkPolicy") - public void setEgressNetworkPolicy(EgressNetworkPolicy egressNetworkPolicy) { - this.egressNetworkPolicy = egressNetworkPolicy; - } - - @JsonProperty("EgressNetworkPolicyList") - public EgressNetworkPolicyList getEgressNetworkPolicyList() { - return egressNetworkPolicyList; - } - - @JsonProperty("EgressNetworkPolicyList") - public void setEgressNetworkPolicyList(EgressNetworkPolicyList egressNetworkPolicyList) { - this.egressNetworkPolicyList = egressNetworkPolicyList; - } - - @JsonProperty("GetOptions") - public GetOptions getGetOptions() { - return getOptions; - } - - @JsonProperty("GetOptions") - public void setGetOptions(GetOptions getOptions) { - this.getOptions = getOptions; - } - - @JsonProperty("Group") - public Group getGroup() { - return group; - } - - @JsonProperty("Group") - public void setGroup(Group group) { - this.group = group; - } - - @JsonProperty("GroupList") - public GroupList getGroupList() { - return groupList; - } - - @JsonProperty("GroupList") - public void setGroupList(GroupList groupList) { - this.groupList = groupList; - } - - @JsonProperty("HelmChartRepository") - public HelmChartRepository getHelmChartRepository() { - return helmChartRepository; - } - - @JsonProperty("HelmChartRepository") - public void setHelmChartRepository(HelmChartRepository helmChartRepository) { - this.helmChartRepository = helmChartRepository; - } - - @JsonProperty("HelmChartRepositoryList") - public HelmChartRepositoryList getHelmChartRepositoryList() { - return helmChartRepositoryList; - } - - @JsonProperty("HelmChartRepositoryList") - public void setHelmChartRepositoryList(HelmChartRepositoryList helmChartRepositoryList) { - this.helmChartRepositoryList = helmChartRepositoryList; - } - - @JsonProperty("HostSubnet") - public HostSubnet getHostSubnet() { - return hostSubnet; - } - - @JsonProperty("HostSubnet") - public void setHostSubnet(HostSubnet hostSubnet) { - this.hostSubnet = hostSubnet; - } - - @JsonProperty("HostSubnetList") - public HostSubnetList getHostSubnetList() { - return hostSubnetList; - } - - @JsonProperty("HostSubnetList") - public void setHostSubnetList(HostSubnetList hostSubnetList) { - this.hostSubnetList = hostSubnetList; - } - - @JsonProperty("Identity") - public Identity getIdentity() { - return identity; - } - - @JsonProperty("Identity") - public void setIdentity(Identity identity) { - this.identity = identity; - } - - @JsonProperty("IdentityList") - public IdentityList getIdentityList() { - return identityList; - } - - @JsonProperty("IdentityList") - public void setIdentityList(IdentityList identityList) { - this.identityList = identityList; - } - - @JsonProperty("ImageList") - public ImageList getImageList() { - return imageList; - } - - @JsonProperty("ImageList") - public void setImageList(ImageList imageList) { - this.imageList = imageList; - } - - @JsonProperty("ImageSignature") - public ImageSignature getImageSignature() { - return imageSignature; - } - - @JsonProperty("ImageSignature") - public void setImageSignature(ImageSignature imageSignature) { - this.imageSignature = imageSignature; - } - - @JsonProperty("ImageStreamImage") - public ImageStreamImage getImageStreamImage() { - return imageStreamImage; - } - - @JsonProperty("ImageStreamImage") - public void setImageStreamImage(ImageStreamImage imageStreamImage) { - this.imageStreamImage = imageStreamImage; - } - - @JsonProperty("ImageStreamImport") - public ImageStreamImport getImageStreamImport() { - return imageStreamImport; - } - - @JsonProperty("ImageStreamImport") - public void setImageStreamImport(ImageStreamImport imageStreamImport) { - this.imageStreamImport = imageStreamImport; - } - - @JsonProperty("ImageStreamList") - public ImageStreamList getImageStreamList() { - return imageStreamList; - } - - @JsonProperty("ImageStreamList") - public void setImageStreamList(ImageStreamList imageStreamList) { - this.imageStreamList = imageStreamList; - } - - @JsonProperty("ImageStreamMapping") - public ImageStreamMapping getImageStreamMapping() { - return imageStreamMapping; - } - - @JsonProperty("ImageStreamMapping") - public void setImageStreamMapping(ImageStreamMapping imageStreamMapping) { - this.imageStreamMapping = imageStreamMapping; - } - - @JsonProperty("ImageStreamTagList") - public ImageStreamTagList getImageStreamTagList() { - return imageStreamTagList; - } - - @JsonProperty("ImageStreamTagList") - public void setImageStreamTagList(ImageStreamTagList imageStreamTagList) { - this.imageStreamTagList = imageStreamTagList; - } - - @JsonProperty("ImageTag") - public ImageTag getImageTag() { - return imageTag; - } - - @JsonProperty("ImageTag") - public void setImageTag(ImageTag imageTag) { - this.imageTag = imageTag; - } - - @JsonProperty("ImageTagList") - public ImageTagList getImageTagList() { - return imageTagList; - } - - @JsonProperty("ImageTagList") - public void setImageTagList(ImageTagList imageTagList) { - this.imageTagList = imageTagList; - } - - @JsonProperty("Info") - public Info getInfo() { - return info; - } - - @JsonProperty("Info") - public void setInfo(Info info) { - this.info = info; - } - - @JsonProperty("ListOptions") - public ListOptions getListOptions() { - return listOptions; - } - - @JsonProperty("ListOptions") - public void setListOptions(ListOptions listOptions) { - this.listOptions = listOptions; - } - - @JsonProperty("LocalResourceAccessReview") - public LocalResourceAccessReview getLocalResourceAccessReview() { - return localResourceAccessReview; - } - - @JsonProperty("LocalResourceAccessReview") - public void setLocalResourceAccessReview(LocalResourceAccessReview localResourceAccessReview) { - this.localResourceAccessReview = localResourceAccessReview; - } - - @JsonProperty("LocalSubjectAccessReview") - public LocalSubjectAccessReview getLocalSubjectAccessReview() { - return localSubjectAccessReview; - } - - @JsonProperty("LocalSubjectAccessReview") - public void setLocalSubjectAccessReview(LocalSubjectAccessReview localSubjectAccessReview) { - this.localSubjectAccessReview = localSubjectAccessReview; - } - - @JsonProperty("NetNamespace") - public NetNamespace getNetNamespace() { - return netNamespace; - } - - @JsonProperty("NetNamespace") - public void setNetNamespace(NetNamespace netNamespace) { - this.netNamespace = netNamespace; - } - - @JsonProperty("NetNamespaceList") - public NetNamespaceList getNetNamespaceList() { - return netNamespaceList; - } - - @JsonProperty("NetNamespaceList") - public void setNetNamespaceList(NetNamespaceList netNamespaceList) { - this.netNamespaceList = netNamespaceList; - } - - @JsonProperty("OAuthAccessToken") - public OAuthAccessToken getOAuthAccessToken() { - return oAuthAccessToken; - } - - @JsonProperty("OAuthAccessToken") - public void setOAuthAccessToken(OAuthAccessToken oAuthAccessToken) { - this.oAuthAccessToken = oAuthAccessToken; - } - - @JsonProperty("OAuthAccessTokenList") - public OAuthAccessTokenList getOAuthAccessTokenList() { - return oAuthAccessTokenList; - } - - @JsonProperty("OAuthAccessTokenList") - public void setOAuthAccessTokenList(OAuthAccessTokenList oAuthAccessTokenList) { - this.oAuthAccessTokenList = oAuthAccessTokenList; - } - - @JsonProperty("OAuthAuthorizeToken") - public OAuthAuthorizeToken getOAuthAuthorizeToken() { - return oAuthAuthorizeToken; - } - - @JsonProperty("OAuthAuthorizeToken") - public void setOAuthAuthorizeToken(OAuthAuthorizeToken oAuthAuthorizeToken) { - this.oAuthAuthorizeToken = oAuthAuthorizeToken; - } - - @JsonProperty("OAuthAuthorizeTokenList") - public OAuthAuthorizeTokenList getOAuthAuthorizeTokenList() { - return oAuthAuthorizeTokenList; - } - - @JsonProperty("OAuthAuthorizeTokenList") - public void setOAuthAuthorizeTokenList(OAuthAuthorizeTokenList oAuthAuthorizeTokenList) { - this.oAuthAuthorizeTokenList = oAuthAuthorizeTokenList; - } - - @JsonProperty("OAuthClient") - public OAuthClient getOAuthClient() { - return oAuthClient; - } - - @JsonProperty("OAuthClient") - public void setOAuthClient(OAuthClient oAuthClient) { - this.oAuthClient = oAuthClient; - } - - @JsonProperty("OAuthClientAuthorization") - public OAuthClientAuthorization getOAuthClientAuthorization() { - return oAuthClientAuthorization; - } - - @JsonProperty("OAuthClientAuthorization") - public void setOAuthClientAuthorization(OAuthClientAuthorization oAuthClientAuthorization) { - this.oAuthClientAuthorization = oAuthClientAuthorization; - } - - @JsonProperty("OAuthClientAuthorizationList") - public OAuthClientAuthorizationList getOAuthClientAuthorizationList() { - return oAuthClientAuthorizationList; - } - - @JsonProperty("OAuthClientAuthorizationList") - public void setOAuthClientAuthorizationList(OAuthClientAuthorizationList oAuthClientAuthorizationList) { - this.oAuthClientAuthorizationList = oAuthClientAuthorizationList; - } - - @JsonProperty("OAuthClientList") - public OAuthClientList getOAuthClientList() { - return oAuthClientList; - } - - @JsonProperty("OAuthClientList") - public void setOAuthClientList(OAuthClientList oAuthClientList) { - this.oAuthClientList = oAuthClientList; - } - - @JsonProperty("ObjectMeta") - public ObjectMeta getObjectMeta() { - return objectMeta; - } - - @JsonProperty("ObjectMeta") - public void setObjectMeta(ObjectMeta objectMeta) { - this.objectMeta = objectMeta; - } - - @JsonProperty("OpenShiftRoleBindingRestrictionList") - public RoleBindingRestrictionList getOpenShiftRoleBindingRestrictionList() { - return openShiftRoleBindingRestrictionList; - } - - @JsonProperty("OpenShiftRoleBindingRestrictionList") - public void setOpenShiftRoleBindingRestrictionList(RoleBindingRestrictionList openShiftRoleBindingRestrictionList) { - this.openShiftRoleBindingRestrictionList = openShiftRoleBindingRestrictionList; - } - - @JsonProperty("OpenshiftClusterRole") - public ClusterRole getOpenshiftClusterRole() { - return openshiftClusterRole; - } - - @JsonProperty("OpenshiftClusterRole") - public void setOpenshiftClusterRole(ClusterRole openshiftClusterRole) { - this.openshiftClusterRole = openshiftClusterRole; - } - - @JsonProperty("OpenshiftClusterRoleBinding") - public ClusterRoleBinding getOpenshiftClusterRoleBinding() { - return openshiftClusterRoleBinding; - } - - @JsonProperty("OpenshiftClusterRoleBinding") - public void setOpenshiftClusterRoleBinding(ClusterRoleBinding openshiftClusterRoleBinding) { - this.openshiftClusterRoleBinding = openshiftClusterRoleBinding; - } - - @JsonProperty("OpenshiftClusterRoleBindingList") - public ClusterRoleBindingList getOpenshiftClusterRoleBindingList() { - return openshiftClusterRoleBindingList; - } - - @JsonProperty("OpenshiftClusterRoleBindingList") - public void setOpenshiftClusterRoleBindingList(ClusterRoleBindingList openshiftClusterRoleBindingList) { - this.openshiftClusterRoleBindingList = openshiftClusterRoleBindingList; - } - - @JsonProperty("OpenshiftClusterRoleList") - public ClusterRoleList getOpenshiftClusterRoleList() { - return openshiftClusterRoleList; - } - - @JsonProperty("OpenshiftClusterRoleList") - public void setOpenshiftClusterRoleList(ClusterRoleList openshiftClusterRoleList) { - this.openshiftClusterRoleList = openshiftClusterRoleList; - } - - @JsonProperty("OpenshiftClusterRoleScopeRestriction") - public ClusterRoleScopeRestriction getOpenshiftClusterRoleScopeRestriction() { - return openshiftClusterRoleScopeRestriction; - } - - @JsonProperty("OpenshiftClusterRoleScopeRestriction") - public void setOpenshiftClusterRoleScopeRestriction(ClusterRoleScopeRestriction openshiftClusterRoleScopeRestriction) { - this.openshiftClusterRoleScopeRestriction = openshiftClusterRoleScopeRestriction; - } - - @JsonProperty("OpenshiftRole") - public Role getOpenshiftRole() { - return openshiftRole; - } - - @JsonProperty("OpenshiftRole") - public void setOpenshiftRole(Role openshiftRole) { - this.openshiftRole = openshiftRole; - } - - @JsonProperty("OpenshiftRoleBinding") - public RoleBinding getOpenshiftRoleBinding() { - return openshiftRoleBinding; - } - - @JsonProperty("OpenshiftRoleBinding") - public void setOpenshiftRoleBinding(RoleBinding openshiftRoleBinding) { - this.openshiftRoleBinding = openshiftRoleBinding; - } - - @JsonProperty("OpenshiftRoleBindingList") - public RoleBindingList getOpenshiftRoleBindingList() { - return openshiftRoleBindingList; - } - - @JsonProperty("OpenshiftRoleBindingList") - public void setOpenshiftRoleBindingList(RoleBindingList openshiftRoleBindingList) { - this.openshiftRoleBindingList = openshiftRoleBindingList; - } - - @JsonProperty("OpenshiftRoleBindingRestriction") - public RoleBindingRestriction getOpenshiftRoleBindingRestriction() { - return openshiftRoleBindingRestriction; - } - - @JsonProperty("OpenshiftRoleBindingRestriction") - public void setOpenshiftRoleBindingRestriction(RoleBindingRestriction openshiftRoleBindingRestriction) { - this.openshiftRoleBindingRestriction = openshiftRoleBindingRestriction; - } - - @JsonProperty("OpenshiftRoleBindingRestrictionSpec") - public RoleBindingRestrictionSpec getOpenshiftRoleBindingRestrictionSpec() { - return openshiftRoleBindingRestrictionSpec; - } - - @JsonProperty("OpenshiftRoleBindingRestrictionSpec") - public void setOpenshiftRoleBindingRestrictionSpec(RoleBindingRestrictionSpec openshiftRoleBindingRestrictionSpec) { - this.openshiftRoleBindingRestrictionSpec = openshiftRoleBindingRestrictionSpec; - } - - @JsonProperty("OpenshiftRoleList") - public RoleList getOpenshiftRoleList() { - return openshiftRoleList; - } - - @JsonProperty("OpenshiftRoleList") - public void setOpenshiftRoleList(RoleList openshiftRoleList) { - this.openshiftRoleList = openshiftRoleList; - } - - @JsonProperty("Patch") - public Patch getPatch() { - return patch; - } - - @JsonProperty("Patch") - public void setPatch(Patch patch) { - this.patch = patch; - } - - @JsonProperty("PatchOptions") - public PatchOptions getPatchOptions() { - return patchOptions; - } - - @JsonProperty("PatchOptions") - public void setPatchOptions(PatchOptions patchOptions) { - this.patchOptions = patchOptions; - } - - @JsonProperty("PodSecurityPolicyReview") - public PodSecurityPolicyReview getPodSecurityPolicyReview() { - return podSecurityPolicyReview; - } - - @JsonProperty("PodSecurityPolicyReview") - public void setPodSecurityPolicyReview(PodSecurityPolicyReview podSecurityPolicyReview) { - this.podSecurityPolicyReview = podSecurityPolicyReview; - } - - @JsonProperty("PodSecurityPolicySelfSubjectReview") - public PodSecurityPolicySelfSubjectReview getPodSecurityPolicySelfSubjectReview() { - return podSecurityPolicySelfSubjectReview; - } - - @JsonProperty("PodSecurityPolicySelfSubjectReview") - public void setPodSecurityPolicySelfSubjectReview(PodSecurityPolicySelfSubjectReview podSecurityPolicySelfSubjectReview) { - this.podSecurityPolicySelfSubjectReview = podSecurityPolicySelfSubjectReview; - } - - @JsonProperty("PodSecurityPolicySubjectReview") - public PodSecurityPolicySubjectReview getPodSecurityPolicySubjectReview() { - return podSecurityPolicySubjectReview; - } - - @JsonProperty("PodSecurityPolicySubjectReview") - public void setPodSecurityPolicySubjectReview(PodSecurityPolicySubjectReview podSecurityPolicySubjectReview) { - this.podSecurityPolicySubjectReview = podSecurityPolicySubjectReview; - } - - @JsonProperty("Project") - public Project getProject() { - return project; - } - - @JsonProperty("Project") - public void setProject(Project project) { - this.project = project; - } - - @JsonProperty("ProjectHelmChartRepository") - public ProjectHelmChartRepository getProjectHelmChartRepository() { - return projectHelmChartRepository; - } - - @JsonProperty("ProjectHelmChartRepository") - public void setProjectHelmChartRepository(ProjectHelmChartRepository projectHelmChartRepository) { - this.projectHelmChartRepository = projectHelmChartRepository; - } - - @JsonProperty("ProjectHelmChartRepositoryList") - public ProjectHelmChartRepositoryList getProjectHelmChartRepositoryList() { - return projectHelmChartRepositoryList; - } - - @JsonProperty("ProjectHelmChartRepositoryList") - public void setProjectHelmChartRepositoryList(ProjectHelmChartRepositoryList projectHelmChartRepositoryList) { - this.projectHelmChartRepositoryList = projectHelmChartRepositoryList; - } - - @JsonProperty("ProjectList") - public ProjectList getProjectList() { - return projectList; - } - - @JsonProperty("ProjectList") - public void setProjectList(ProjectList projectList) { - this.projectList = projectList; - } - - @JsonProperty("ProjectRequest") - public ProjectRequest getProjectRequest() { - return projectRequest; - } - - @JsonProperty("ProjectRequest") - public void setProjectRequest(ProjectRequest projectRequest) { - this.projectRequest = projectRequest; - } - - @JsonProperty("Quantity") - public Quantity getQuantity() { - return quantity; - } - - @JsonProperty("Quantity") - public void setQuantity(Quantity quantity) { - this.quantity = quantity; - } - - @JsonProperty("RangeAllocation") - public RangeAllocation getRangeAllocation() { - return rangeAllocation; - } - - @JsonProperty("RangeAllocation") - public void setRangeAllocation(RangeAllocation rangeAllocation) { - this.rangeAllocation = rangeAllocation; - } - - @JsonProperty("RangeAllocationList") - public RangeAllocationList getRangeAllocationList() { - return rangeAllocationList; - } - - @JsonProperty("RangeAllocationList") - public void setRangeAllocationList(RangeAllocationList rangeAllocationList) { - this.rangeAllocationList = rangeAllocationList; - } - - @JsonProperty("ResourceAccessReview") - public ResourceAccessReview getResourceAccessReview() { - return resourceAccessReview; - } - - @JsonProperty("ResourceAccessReview") - public void setResourceAccessReview(ResourceAccessReview resourceAccessReview) { - this.resourceAccessReview = resourceAccessReview; - } - - @JsonProperty("ResourceAccessReviewResponse") - public ResourceAccessReviewResponse getResourceAccessReviewResponse() { - return resourceAccessReviewResponse; - } - - @JsonProperty("ResourceAccessReviewResponse") - public void setResourceAccessReviewResponse(ResourceAccessReviewResponse resourceAccessReviewResponse) { - this.resourceAccessReviewResponse = resourceAccessReviewResponse; - } - - @JsonProperty("RootPaths") - public RootPaths getRootPaths() { - return rootPaths; - } - - @JsonProperty("RootPaths") - public void setRootPaths(RootPaths rootPaths) { - this.rootPaths = rootPaths; - } - - @JsonProperty("Route") - public Route getRoute() { - return route; - } - - @JsonProperty("Route") - public void setRoute(Route route) { - this.route = route; - } - - @JsonProperty("RouteList") - public RouteList getRouteList() { - return routeList; - } - - @JsonProperty("RouteList") - public void setRouteList(RouteList routeList) { - this.routeList = routeList; - } - - @JsonProperty("SecurityContextConstraints") - public SecurityContextConstraints getSecurityContextConstraints() { - return securityContextConstraints; - } - - @JsonProperty("SecurityContextConstraints") - public void setSecurityContextConstraints(SecurityContextConstraints securityContextConstraints) { - this.securityContextConstraints = securityContextConstraints; - } - - @JsonProperty("SecurityContextConstraintsList") - public SecurityContextConstraintsList getSecurityContextConstraintsList() { - return securityContextConstraintsList; - } - - @JsonProperty("SecurityContextConstraintsList") - public void setSecurityContextConstraintsList(SecurityContextConstraintsList securityContextConstraintsList) { - this.securityContextConstraintsList = securityContextConstraintsList; - } - - @JsonProperty("SelfSubjectRulesReview") - public SelfSubjectRulesReview getSelfSubjectRulesReview() { - return selfSubjectRulesReview; - } - - @JsonProperty("SelfSubjectRulesReview") - public void setSelfSubjectRulesReview(SelfSubjectRulesReview selfSubjectRulesReview) { - this.selfSubjectRulesReview = selfSubjectRulesReview; - } - - @JsonProperty("Status") - public Status getStatus() { - return status; - } - - @JsonProperty("Status") - public void setStatus(Status status) { - this.status = status; - } - - @JsonProperty("SubjectAccessReview") - public SubjectAccessReview getSubjectAccessReview() { - return subjectAccessReview; - } - - @JsonProperty("SubjectAccessReview") - public void setSubjectAccessReview(SubjectAccessReview subjectAccessReview) { - this.subjectAccessReview = subjectAccessReview; - } - - @JsonProperty("SubjectAccessReviewResponse") - public SubjectAccessReviewResponse getSubjectAccessReviewResponse() { - return subjectAccessReviewResponse; - } - - @JsonProperty("SubjectAccessReviewResponse") - public void setSubjectAccessReviewResponse(SubjectAccessReviewResponse subjectAccessReviewResponse) { - this.subjectAccessReviewResponse = subjectAccessReviewResponse; - } - - @JsonProperty("SubjectRulesReview") - public SubjectRulesReview getSubjectRulesReview() { - return subjectRulesReview; - } - - @JsonProperty("SubjectRulesReview") - public void setSubjectRulesReview(SubjectRulesReview subjectRulesReview) { - this.subjectRulesReview = subjectRulesReview; - } - - @JsonProperty("TagEvent") - public TagEvent getTagEvent() { - return tagEvent; - } - - @JsonProperty("TagEvent") - public void setTagEvent(TagEvent tagEvent) { - this.tagEvent = tagEvent; - } - - @JsonProperty("Template") - public Template getTemplate() { - return template; - } - - @JsonProperty("Template") - public void setTemplate(Template template) { - this.template = template; - } - - @JsonProperty("TemplateInstance") - public TemplateInstance getTemplateInstance() { - return templateInstance; - } - - @JsonProperty("TemplateInstance") - public void setTemplateInstance(TemplateInstance templateInstance) { - this.templateInstance = templateInstance; - } - - @JsonProperty("TemplateInstanceList") - public TemplateInstanceList getTemplateInstanceList() { - return templateInstanceList; - } - - @JsonProperty("TemplateInstanceList") - public void setTemplateInstanceList(TemplateInstanceList templateInstanceList) { - this.templateInstanceList = templateInstanceList; - } - - @JsonProperty("TemplateList") - public TemplateList getTemplateList() { - return templateList; - } - - @JsonProperty("TemplateList") - public void setTemplateList(TemplateList templateList) { - this.templateList = templateList; - } - - @JsonProperty("Time") - public String getTime() { - return time; - } - - @JsonProperty("Time") - public void setTime(String time) { - this.time = time; - } - - @JsonProperty("TokenReview") - public TokenReview getTokenReview() { - return tokenReview; - } - - @JsonProperty("TokenReview") - public void setTokenReview(TokenReview tokenReview) { - this.tokenReview = tokenReview; - } - - @JsonProperty("TypeMeta") - public TypeMeta getTypeMeta() { - return typeMeta; - } - - @JsonProperty("TypeMeta") - public void setTypeMeta(TypeMeta typeMeta) { - this.typeMeta = typeMeta; - } - - @JsonProperty("UpdateOptions") - public UpdateOptions getUpdateOptions() { - return updateOptions; - } - - @JsonProperty("UpdateOptions") - public void setUpdateOptions(UpdateOptions updateOptions) { - this.updateOptions = updateOptions; - } - - @JsonProperty("User") - public User getUser() { - return user; - } - - @JsonProperty("User") - public void setUser(User user) { - this.user = user; - } - - @JsonProperty("UserIdentityMapping") - public UserIdentityMapping getUserIdentityMapping() { - return userIdentityMapping; - } - - @JsonProperty("UserIdentityMapping") - public void setUserIdentityMapping(UserIdentityMapping userIdentityMapping) { - this.userIdentityMapping = userIdentityMapping; - } - - @JsonProperty("UserList") - public UserList getUserList() { - return userList; - } - - @JsonProperty("UserList") - public void setUserList(UserList userList) { - this.userList = userList; - } - - @JsonProperty("UserOAuthAccessToken") - public UserOAuthAccessToken getUserOAuthAccessToken() { - return userOAuthAccessToken; - } - - @JsonProperty("UserOAuthAccessToken") - public void setUserOAuthAccessToken(UserOAuthAccessToken userOAuthAccessToken) { - this.userOAuthAccessToken = userOAuthAccessToken; - } - - @JsonProperty("UserOAuthAccessTokenList") - public UserOAuthAccessTokenList getUserOAuthAccessTokenList() { - return userOAuthAccessTokenList; - } - - @JsonProperty("UserOAuthAccessTokenList") - public void setUserOAuthAccessTokenList(UserOAuthAccessTokenList userOAuthAccessTokenList) { - this.userOAuthAccessTokenList = userOAuthAccessTokenList; - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/AppliedClusterResourceQuota.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/AppliedClusterResourceQuota.java index fbfdd56e743..57fad0ea7f4 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/AppliedClusterResourceQuota.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/AppliedClusterResourceQuota.java @@ -18,6 +18,7 @@ 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.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -48,7 +49,7 @@ "" }) @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(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @@ -82,7 +83,7 @@ public class AppliedClusterResourceQuota implements Editable bindingIDs = new ArrayList<>(); @JsonProperty("secret") - private io.fabric8.kubernetes.api.model.ObjectReference secret; + private ObjectReference secret; @JsonProperty("templateInstance") - private io.fabric8.kubernetes.api.model.ObjectReference templateInstance; + private ObjectReference templateInstance; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -74,7 +75,7 @@ public class BrokerTemplateInstanceSpec implements Editable bindingIDs, io.fabric8.kubernetes.api.model.ObjectReference secret, io.fabric8.kubernetes.api.model.ObjectReference templateInstance) { + public BrokerTemplateInstanceSpec(List bindingIDs, ObjectReference secret, ObjectReference templateInstance) { super(); this.bindingIDs = bindingIDs; this.secret = secret; @@ -93,22 +94,22 @@ public void setBindingIDs(List bindingIDs) { } @JsonProperty("secret") - public io.fabric8.kubernetes.api.model.ObjectReference getSecret() { + public ObjectReference getSecret() { return secret; } @JsonProperty("secret") - public void setSecret(io.fabric8.kubernetes.api.model.ObjectReference secret) { + public void setSecret(ObjectReference secret) { this.secret = secret; } @JsonProperty("templateInstance") - public io.fabric8.kubernetes.api.model.ObjectReference getTemplateInstance() { + public ObjectReference getTemplateInstance() { return templateInstance; } @JsonProperty("templateInstance") - public void setTemplateInstance(io.fabric8.kubernetes.api.model.ObjectReference templateInstance) { + public void setTemplateInstance(ObjectReference templateInstance) { this.templateInstance = templateInstance; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Build.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Build.java index 02e4514c203..97cf13d8582 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Build.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Build.java @@ -18,6 +18,7 @@ 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.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -48,7 +49,7 @@ "" }) @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(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @@ -82,7 +83,7 @@ public class Build implements Editable , HasMetadata, Namespaced @JsonProperty("kind") private String kind = "Build"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("spec") private BuildSpec spec; @JsonProperty("status") @@ -97,7 +98,7 @@ public class Build implements Editable , HasMetadata, Namespaced public Build() { } - public Build(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, BuildSpec spec, BuildStatus status) { + public Build(String apiVersion, String kind, ObjectMeta metadata, BuildSpec spec, BuildStatus status) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -147,12 +148,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildConfig.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildConfig.java index 792ee702579..e65db68b4f0 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildConfig.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildConfig.java @@ -18,6 +18,7 @@ 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.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -48,7 +49,7 @@ "" }) @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(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @@ -82,7 +83,7 @@ public class BuildConfig implements Editable , HasMetadata, @JsonProperty("kind") private String kind = "BuildConfig"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("spec") private BuildConfigSpec spec; @JsonProperty("status") @@ -97,7 +98,7 @@ public class BuildConfig implements Editable , HasMetadata, public BuildConfig() { } - public BuildConfig(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, BuildConfigSpec spec, BuildConfigStatus status) { + public BuildConfig(String apiVersion, String kind, ObjectMeta metadata, BuildConfigSpec spec, BuildConfigStatus status) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -147,12 +148,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildConfigSpec.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildConfigSpec.java index b918d6a4b14..5cd6b43ebf5 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildConfigSpec.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildConfigSpec.java @@ -23,6 +23,7 @@ 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; @@ -58,7 +59,7 @@ @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), - @BuildableReference(io.fabric8.kubernetes.api.model.ResourceRequirements.class), + @BuildableReference(ResourceRequirements.class), @BuildableReference(IntOrString.class), @BuildableReference(ObjectReference.class), @BuildableReference(LocalObjectReference.class), @@ -82,7 +83,7 @@ public class BuildConfigSpec implements Editable , Kuber @JsonProperty("postCommit") private BuildPostCommitSpec postCommit; @JsonProperty("resources") - private io.fabric8.kubernetes.api.model.ResourceRequirements resources; + private ResourceRequirements resources; @JsonProperty("revision") private SourceRevision revision; @JsonProperty("runPolicy") @@ -108,7 +109,7 @@ public class BuildConfigSpec implements Editable , Kuber public BuildConfigSpec() { } - public BuildConfigSpec(Long completionDeadlineSeconds, Integer failedBuildsHistoryLimit, Boolean mountTrustedCA, Map nodeSelector, BuildOutput output, BuildPostCommitSpec postCommit, io.fabric8.kubernetes.api.model.ResourceRequirements resources, SourceRevision revision, String runPolicy, String serviceAccount, BuildSource source, BuildStrategy strategy, Integer successfulBuildsHistoryLimit, List triggers) { + public BuildConfigSpec(Long completionDeadlineSeconds, Integer failedBuildsHistoryLimit, Boolean mountTrustedCA, Map nodeSelector, BuildOutput output, BuildPostCommitSpec postCommit, ResourceRequirements resources, SourceRevision revision, String runPolicy, String serviceAccount, BuildSource source, BuildStrategy strategy, Integer successfulBuildsHistoryLimit, List triggers) { super(); this.completionDeadlineSeconds = completionDeadlineSeconds; this.failedBuildsHistoryLimit = failedBuildsHistoryLimit; @@ -188,12 +189,12 @@ public void setPostCommit(BuildPostCommitSpec postCommit) { } @JsonProperty("resources") - public io.fabric8.kubernetes.api.model.ResourceRequirements getResources() { + public ResourceRequirements getResources() { return resources; } @JsonProperty("resources") - public void setResources(io.fabric8.kubernetes.api.model.ResourceRequirements resources) { + public void setResources(ResourceRequirements resources) { this.resources = resources; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/HostSubnetList.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildLog.java similarity index 72% rename from kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/HostSubnetList.java rename to kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildLog.java index 8e5597ccdbc..6c1ff7871f9 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/HostSubnetList.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildLog.java @@ -1,9 +1,7 @@ package io.fabric8.openshift.api.model; -import java.util.ArrayList; import java.util.LinkedHashMap; -import java.util.List; import java.util.Map; import javax.annotation.Generated; import com.fasterxml.jackson.annotation.JsonAnyGetter; @@ -17,9 +15,7 @@ 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; @@ -40,9 +36,7 @@ @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ "apiVersion", - "kind", - "metadata", - "items" + "kind" }) @ToString @EqualsAndHashCode @@ -65,9 +59,9 @@ @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) }) @Version("v1") -@Group("network.openshift.io") +@Group("build.openshift.io") @Generated("jsonschema2pojo") -public class HostSubnetList implements Editable , KubernetesResource, KubernetesResourceList +public class BuildLog implements Editable , KubernetesResource { /** @@ -76,19 +70,14 @@ public class HostSubnetList implements Editable , Kuberne * */ @JsonProperty("apiVersion") - private String apiVersion = "network.openshift.io/v1"; - @JsonProperty("items") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List items = new ArrayList<>(); + private String apiVersion = "build.openshift.io/v1"; /** * * (Required) * */ @JsonProperty("kind") - private String kind = "HostSubnetList"; - @JsonProperty("metadata") - private ListMeta metadata; + private String kind = "BuildLog"; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -96,15 +85,13 @@ public class HostSubnetList implements Editable , Kuberne * No args constructor for use in serialization * */ - public HostSubnetList() { + public BuildLog() { } - public HostSubnetList(String apiVersion, List items, String kind, ListMeta metadata) { + public BuildLog(String apiVersion, String kind) { super(); this.apiVersion = apiVersion; - this.items = items; this.kind = kind; - this.metadata = metadata; } /** @@ -127,17 +114,6 @@ public void setApiVersion(String apiVersion) { this.apiVersion = apiVersion; } - @JsonProperty("items") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getItems() { - return items; - } - - @JsonProperty("items") - public void setItems(List items) { - this.items = items; - } - /** * * (Required) @@ -158,23 +134,13 @@ 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; - } - @JsonIgnore - public HostSubnetListBuilder edit() { - return new HostSubnetListBuilder(this); + public BuildLogBuilder edit() { + return new BuildLogBuilder(this); } @JsonIgnore - public HostSubnetListBuilder toBuilder() { + public BuildLogBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildOutput.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildOutput.java index b77fc8ddc89..92216abdc4b 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildOutput.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildOutput.java @@ -18,7 +18,9 @@ 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; @@ -48,8 +50,8 @@ @BuildableReference(PodTemplateSpec.class), @BuildableReference(ResourceRequirements.class), @BuildableReference(IntOrString.class), - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class), - @BuildableReference(io.fabric8.kubernetes.api.model.LocalObjectReference.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") @@ -60,9 +62,9 @@ public class BuildOutput implements Editable , KubernetesRes @JsonInclude(JsonInclude.Include.NON_EMPTY) private List imageLabels = new ArrayList<>(); @JsonProperty("pushSecret") - private io.fabric8.kubernetes.api.model.LocalObjectReference pushSecret; + private LocalObjectReference pushSecret; @JsonProperty("to") - private io.fabric8.kubernetes.api.model.ObjectReference to; + private ObjectReference to; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -73,7 +75,7 @@ public class BuildOutput implements Editable , KubernetesRes public BuildOutput() { } - public BuildOutput(List imageLabels, io.fabric8.kubernetes.api.model.LocalObjectReference pushSecret, io.fabric8.kubernetes.api.model.ObjectReference to) { + public BuildOutput(List imageLabels, LocalObjectReference pushSecret, ObjectReference to) { super(); this.imageLabels = imageLabels; this.pushSecret = pushSecret; @@ -92,22 +94,22 @@ public void setImageLabels(List imageLabels) { } @JsonProperty("pushSecret") - public io.fabric8.kubernetes.api.model.LocalObjectReference getPushSecret() { + public LocalObjectReference getPushSecret() { return pushSecret; } @JsonProperty("pushSecret") - public void setPushSecret(io.fabric8.kubernetes.api.model.LocalObjectReference pushSecret) { + public void setPushSecret(LocalObjectReference pushSecret) { this.pushSecret = pushSecret; } @JsonProperty("to") - public io.fabric8.kubernetes.api.model.ObjectReference getTo() { + public ObjectReference getTo() { return to; } @JsonProperty("to") - public void setTo(io.fabric8.kubernetes.api.model.ObjectReference to) { + public void setTo(ObjectReference to) { this.to = to; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildRequest.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildRequest.java index 8a374a4de6a..17c7a291559 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildRequest.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildRequest.java @@ -21,6 +21,8 @@ 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.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; @@ -57,13 +59,13 @@ "" }) @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(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(ObjectReference.class), @BuildableReference(LocalObjectReference.class), @BuildableReference(PersistentVolumeClaim.class) }) @@ -91,7 +93,7 @@ public class BuildRequest implements Editable , HasMetadata @JsonInclude(JsonInclude.Include.NON_EMPTY) private List env = new ArrayList<>(); @JsonProperty("from") - private io.fabric8.kubernetes.api.model.ObjectReference from; + private ObjectReference from; /** * * (Required) @@ -102,7 +104,7 @@ public class BuildRequest implements Editable , HasMetadata @JsonProperty("lastVersion") private Long lastVersion; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("revision") private SourceRevision revision; @JsonProperty("sourceStrategyOptions") @@ -111,7 +113,7 @@ public class BuildRequest implements Editable , HasMetadata @JsonInclude(JsonInclude.Include.NON_EMPTY) private List triggeredBy = new ArrayList<>(); @JsonProperty("triggeredByImage") - private io.fabric8.kubernetes.api.model.ObjectReference triggeredByImage; + private ObjectReference triggeredByImage; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -122,7 +124,7 @@ public class BuildRequest implements Editable , HasMetadata public BuildRequest() { } - public BuildRequest(String apiVersion, BinaryBuildSource binary, DockerStrategyOptions dockerStrategyOptions, List env, io.fabric8.kubernetes.api.model.ObjectReference from, String kind, Long lastVersion, io.fabric8.kubernetes.api.model.ObjectMeta metadata, SourceRevision revision, SourceStrategyOptions sourceStrategyOptions, List triggeredBy, io.fabric8.kubernetes.api.model.ObjectReference triggeredByImage) { + public BuildRequest(String apiVersion, BinaryBuildSource binary, DockerStrategyOptions dockerStrategyOptions, List env, ObjectReference from, String kind, Long lastVersion, ObjectMeta metadata, SourceRevision revision, SourceStrategyOptions sourceStrategyOptions, List triggeredBy, ObjectReference triggeredByImage) { super(); this.apiVersion = apiVersion; this.binary = binary; @@ -190,12 +192,12 @@ public void setEnv(List env) { } @JsonProperty("from") - public io.fabric8.kubernetes.api.model.ObjectReference getFrom() { + public ObjectReference getFrom() { return from; } @JsonProperty("from") - public void setFrom(io.fabric8.kubernetes.api.model.ObjectReference from) { + public void setFrom(ObjectReference from) { this.from = from; } @@ -230,12 +232,12 @@ public void setLastVersion(Long lastVersion) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } @@ -271,12 +273,12 @@ public void setTriggeredBy(List triggeredBy) { } @JsonProperty("triggeredByImage") - public io.fabric8.kubernetes.api.model.ObjectReference getTriggeredByImage() { + public ObjectReference getTriggeredByImage() { return triggeredByImage; } @JsonProperty("triggeredByImage") - public void setTriggeredByImage(io.fabric8.kubernetes.api.model.ObjectReference triggeredByImage) { + public void setTriggeredByImage(ObjectReference triggeredByImage) { this.triggeredByImage = triggeredByImage; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildSource.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildSource.java index fa1e29bcb06..5f401b686ed 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildSource.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildSource.java @@ -18,6 +18,7 @@ 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; @@ -56,7 +57,7 @@ @BuildableReference(ResourceRequirements.class), @BuildableReference(IntOrString.class), @BuildableReference(ObjectReference.class), - @BuildableReference(io.fabric8.kubernetes.api.model.LocalObjectReference.class), + @BuildableReference(LocalObjectReference.class), @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") @@ -81,7 +82,7 @@ public class BuildSource implements Editable , KubernetesRes @JsonInclude(JsonInclude.Include.NON_EMPTY) private List secrets = new ArrayList<>(); @JsonProperty("sourceSecret") - private io.fabric8.kubernetes.api.model.LocalObjectReference sourceSecret; + private LocalObjectReference sourceSecret; @JsonProperty("type") private String type; @JsonIgnore @@ -94,7 +95,7 @@ public class BuildSource implements Editable , KubernetesRes public BuildSource() { } - public BuildSource(BinaryBuildSource binary, List configMaps, String contextDir, String dockerfile, GitBuildSource git, List images, List secrets, io.fabric8.kubernetes.api.model.LocalObjectReference sourceSecret, String type) { + public BuildSource(BinaryBuildSource binary, List configMaps, String contextDir, String dockerfile, GitBuildSource git, List images, List secrets, LocalObjectReference sourceSecret, String type) { super(); this.binary = binary; this.configMaps = configMaps; @@ -181,12 +182,12 @@ public void setSecrets(List secrets) { } @JsonProperty("sourceSecret") - public io.fabric8.kubernetes.api.model.LocalObjectReference getSourceSecret() { + public LocalObjectReference getSourceSecret() { return sourceSecret; } @JsonProperty("sourceSecret") - public void setSourceSecret(io.fabric8.kubernetes.api.model.LocalObjectReference sourceSecret) { + public void setSourceSecret(LocalObjectReference sourceSecret) { this.sourceSecret = sourceSecret; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildSpec.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildSpec.java index 296f1c593b6..f51746cec35 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildSpec.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildSpec.java @@ -23,6 +23,7 @@ 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; @@ -55,7 +56,7 @@ @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), - @BuildableReference(io.fabric8.kubernetes.api.model.ResourceRequirements.class), + @BuildableReference(ResourceRequirements.class), @BuildableReference(IntOrString.class), @BuildableReference(ObjectReference.class), @BuildableReference(LocalObjectReference.class), @@ -77,7 +78,7 @@ public class BuildSpec implements Editable , KubernetesResourc @JsonProperty("postCommit") private BuildPostCommitSpec postCommit; @JsonProperty("resources") - private io.fabric8.kubernetes.api.model.ResourceRequirements resources; + private ResourceRequirements resources; @JsonProperty("revision") private SourceRevision revision; @JsonProperty("serviceAccount") @@ -99,7 +100,7 @@ public class BuildSpec implements Editable , KubernetesResourc public BuildSpec() { } - public BuildSpec(Long completionDeadlineSeconds, Boolean mountTrustedCA, Map nodeSelector, BuildOutput output, BuildPostCommitSpec postCommit, io.fabric8.kubernetes.api.model.ResourceRequirements resources, SourceRevision revision, String serviceAccount, BuildSource source, BuildStrategy strategy, List triggeredBy) { + public BuildSpec(Long completionDeadlineSeconds, Boolean mountTrustedCA, Map nodeSelector, BuildOutput output, BuildPostCommitSpec postCommit, ResourceRequirements resources, SourceRevision revision, String serviceAccount, BuildSource source, BuildStrategy strategy, List triggeredBy) { super(); this.completionDeadlineSeconds = completionDeadlineSeconds; this.mountTrustedCA = mountTrustedCA; @@ -166,12 +167,12 @@ public void setPostCommit(BuildPostCommitSpec postCommit) { } @JsonProperty("resources") - public io.fabric8.kubernetes.api.model.ResourceRequirements getResources() { + public ResourceRequirements getResources() { return resources; } @JsonProperty("resources") - public void setResources(io.fabric8.kubernetes.api.model.ResourceRequirements resources) { + public void setResources(ResourceRequirements resources) { this.resources = resources; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildStatus.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildStatus.java index 57d3d46f84c..2eac8d78353 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildStatus.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildStatus.java @@ -20,6 +20,7 @@ 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; @@ -59,7 +60,7 @@ @BuildableReference(PodTemplateSpec.class), @BuildableReference(ResourceRequirements.class), @BuildableReference(IntOrString.class), - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class), + @BuildableReference(ObjectReference.class), @BuildableReference(LocalObjectReference.class), @BuildableReference(PersistentVolumeClaim.class) }) @@ -75,7 +76,7 @@ public class BuildStatus implements Editable , KubernetesRes @JsonInclude(JsonInclude.Include.NON_EMPTY) private List conditions = new ArrayList<>(); @JsonProperty("config") - private io.fabric8.kubernetes.api.model.ObjectReference config; + private ObjectReference config; @JsonProperty("duration") private Long duration; @JsonProperty("logSnippet") @@ -105,7 +106,7 @@ public class BuildStatus implements Editable , KubernetesRes public BuildStatus() { } - public BuildStatus(Boolean cancelled, String completionTimestamp, List conditions, io.fabric8.kubernetes.api.model.ObjectReference config, Long duration, String logSnippet, String message, BuildStatusOutput output, String outputDockerImageReference, String phase, String reason, List stages, String startTimestamp) { + public BuildStatus(Boolean cancelled, String completionTimestamp, List conditions, ObjectReference config, Long duration, String logSnippet, String message, BuildStatusOutput output, String outputDockerImageReference, String phase, String reason, List stages, String startTimestamp) { super(); this.cancelled = cancelled; this.completionTimestamp = completionTimestamp; @@ -154,12 +155,12 @@ public void setConditions(List conditions) { } @JsonProperty("config") - public io.fabric8.kubernetes.api.model.ObjectReference getConfig() { + public ObjectReference getConfig() { return config; } @JsonProperty("config") - public void setConfig(io.fabric8.kubernetes.api.model.ObjectReference config) { + public void setConfig(ObjectReference config) { this.config = config; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterNetwork.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterNetwork.java deleted file mode 100644 index 582f5d12f1c..00000000000 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterNetwork.java +++ /dev/null @@ -1,276 +0,0 @@ - -package io.fabric8.openshift.api.model; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -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.builder.Editable; -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.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "clusterNetworks", - "hostsubnetlength", - "mtu", - "network", - "pluginName", - "serviceNetwork", - "vxlanPort" -}) -@ToString -@EqualsAndHashCode -@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("v1") -@Group("network.openshift.io") -@Generated("jsonschema2pojo") -public class ClusterNetwork implements Editable , HasMetadata -{ - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - private String apiVersion = "network.openshift.io/v1"; - @JsonProperty("clusterNetworks") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List clusterNetworks = new ArrayList<>(); - @JsonProperty("hostsubnetlength") - private Integer hostsubnetlength; - /** - * - * (Required) - * - */ - @JsonProperty("kind") - private String kind = "ClusterNetwork"; - @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; - @JsonProperty("mtu") - private Integer mtu; - @JsonProperty("network") - private String network; - @JsonProperty("pluginName") - private String pluginName; - @JsonProperty("serviceNetwork") - private String serviceNetwork; - @JsonProperty("vxlanPort") - private Integer vxlanPort; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ClusterNetwork() { - } - - public ClusterNetwork(String apiVersion, List clusterNetworks, Integer hostsubnetlength, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, Integer mtu, String network, String pluginName, String serviceNetwork, Integer vxlanPort) { - super(); - this.apiVersion = apiVersion; - this.clusterNetworks = clusterNetworks; - this.hostsubnetlength = hostsubnetlength; - this.kind = kind; - this.metadata = metadata; - this.mtu = mtu; - this.network = network; - this.pluginName = pluginName; - this.serviceNetwork = serviceNetwork; - this.vxlanPort = vxlanPort; - } - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - public String getApiVersion() { - return apiVersion; - } - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - public void setApiVersion(String apiVersion) { - this.apiVersion = apiVersion; - } - - @JsonProperty("clusterNetworks") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getClusterNetworks() { - return clusterNetworks; - } - - @JsonProperty("clusterNetworks") - public void setClusterNetworks(List clusterNetworks) { - this.clusterNetworks = clusterNetworks; - } - - @JsonProperty("hostsubnetlength") - public Integer getHostsubnetlength() { - return hostsubnetlength; - } - - @JsonProperty("hostsubnetlength") - public void setHostsubnetlength(Integer hostsubnetlength) { - this.hostsubnetlength = hostsubnetlength; - } - - /** - * - * (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("mtu") - public Integer getMtu() { - return mtu; - } - - @JsonProperty("mtu") - public void setMtu(Integer mtu) { - this.mtu = mtu; - } - - @JsonProperty("network") - public String getNetwork() { - return network; - } - - @JsonProperty("network") - public void setNetwork(String network) { - this.network = network; - } - - @JsonProperty("pluginName") - public String getPluginName() { - return pluginName; - } - - @JsonProperty("pluginName") - public void setPluginName(String pluginName) { - this.pluginName = pluginName; - } - - @JsonProperty("serviceNetwork") - public String getServiceNetwork() { - return serviceNetwork; - } - - @JsonProperty("serviceNetwork") - public void setServiceNetwork(String serviceNetwork) { - this.serviceNetwork = serviceNetwork; - } - - @JsonProperty("vxlanPort") - public Integer getVxlanPort() { - return vxlanPort; - } - - @JsonProperty("vxlanPort") - public void setVxlanPort(Integer vxlanPort) { - this.vxlanPort = vxlanPort; - } - - @JsonIgnore - public ClusterNetworkBuilder edit() { - return new ClusterNetworkBuilder(this); - } - - @JsonIgnore - public ClusterNetworkBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterResourceQuota.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterResourceQuota.java index cac571b0c2d..03571dc2b99 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterResourceQuota.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterResourceQuota.java @@ -17,6 +17,7 @@ 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.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -47,7 +48,7 @@ "" }) @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(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @@ -81,7 +82,7 @@ public class ClusterResourceQuota implements Editable annotations = new LinkedHashMap<>(); @JsonProperty("labels") - private io.fabric8.kubernetes.api.model.LabelSelector labels; + private LabelSelector labels; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -69,7 +70,7 @@ public class ClusterResourceQuotaSelector implements Editable annotations, io.fabric8.kubernetes.api.model.LabelSelector labels) { + public ClusterResourceQuotaSelector(Map annotations, LabelSelector labels) { super(); this.annotations = annotations; this.labels = labels; @@ -87,12 +88,12 @@ public void setAnnotations(Map annotations) { } @JsonProperty("labels") - public io.fabric8.kubernetes.api.model.LabelSelector getLabels() { + public LabelSelector getLabels() { return labels; } @JsonProperty("labels") - public void setLabels(io.fabric8.kubernetes.api.model.LabelSelector labels) { + public void setLabels(LabelSelector labels) { this.labels = labels; } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/SoftwareRAIDVolume.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterResourceQuotaSpecQSSMatchExpressions.java similarity index 66% rename from kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/SoftwareRAIDVolume.java rename to kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterResourceQuotaSpecQSSMatchExpressions.java index 3b0d4549710..60d338cd3bb 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/SoftwareRAIDVolume.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterResourceQuotaSpecQSSMatchExpressions.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1; +package io.fabric8.openshift.api.model; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -33,9 +33,9 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "level", - "physicalDisks", - "sizeGibibytes" + "operator", + "scopeName", + "values" }) @ToString @EqualsAndHashCode @@ -55,16 +55,16 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class SoftwareRAIDVolume implements Editable , KubernetesResource +public class ClusterResourceQuotaSpecQSSMatchExpressions implements Editable , KubernetesResource { - @JsonProperty("level") - private String level; - @JsonProperty("physicalDisks") + @JsonProperty("operator") + private String operator; + @JsonProperty("scopeName") + private String scopeName; + @JsonProperty("values") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List physicalDisks = new ArrayList<>(); - @JsonProperty("sizeGibibytes") - private Integer sizeGibibytes; + private List values = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -72,54 +72,54 @@ public class SoftwareRAIDVolume implements Editable , * No args constructor for use in serialization * */ - public SoftwareRAIDVolume() { + public ClusterResourceQuotaSpecQSSMatchExpressions() { } - public SoftwareRAIDVolume(String level, List physicalDisks, Integer sizeGibibytes) { + public ClusterResourceQuotaSpecQSSMatchExpressions(String operator, String scopeName, List values) { super(); - this.level = level; - this.physicalDisks = physicalDisks; - this.sizeGibibytes = sizeGibibytes; + this.operator = operator; + this.scopeName = scopeName; + this.values = values; } - @JsonProperty("level") - public String getLevel() { - return level; + @JsonProperty("operator") + public String getOperator() { + return operator; } - @JsonProperty("level") - public void setLevel(String level) { - this.level = level; + @JsonProperty("operator") + public void setOperator(String operator) { + this.operator = operator; } - @JsonProperty("physicalDisks") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getPhysicalDisks() { - return physicalDisks; + @JsonProperty("scopeName") + public String getScopeName() { + return scopeName; } - @JsonProperty("physicalDisks") - public void setPhysicalDisks(List physicalDisks) { - this.physicalDisks = physicalDisks; + @JsonProperty("scopeName") + public void setScopeName(String scopeName) { + this.scopeName = scopeName; } - @JsonProperty("sizeGibibytes") - public Integer getSizeGibibytes() { - return sizeGibibytes; + @JsonProperty("values") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getValues() { + return values; } - @JsonProperty("sizeGibibytes") - public void setSizeGibibytes(Integer sizeGibibytes) { - this.sizeGibibytes = sizeGibibytes; + @JsonProperty("values") + public void setValues(List values) { + this.values = values; } @JsonIgnore - public SoftwareRAIDVolumeBuilder edit() { - return new SoftwareRAIDVolumeBuilder(this); + public ClusterResourceQuotaSpecQSSMatchExpressionsBuilder edit() { + return new ClusterResourceQuotaSpecQSSMatchExpressionsBuilder(this); } @JsonIgnore - public SoftwareRAIDVolumeBuilder toBuilder() { + public ClusterResourceQuotaSpecQSSMatchExpressionsBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/RedirectConfig.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterResourceQuotaSpecQScopeSelector.java similarity index 71% rename from kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/RedirectConfig.java rename to kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterResourceQuotaSpecQScopeSelector.java index 518d34bf004..febf45a860e 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/RedirectConfig.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterResourceQuotaSpecQScopeSelector.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.miscellaneous.network.operator.v1; +package io.fabric8.openshift.api.model; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -33,8 +33,7 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "fallbackIP", - "redirectRules" + "matchExpressions" }) @ToString @EqualsAndHashCode @@ -54,14 +53,12 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class RedirectConfig implements Editable , KubernetesResource +public class ClusterResourceQuotaSpecQScopeSelector implements Editable , KubernetesResource { - @JsonProperty("fallbackIP") - private String fallbackIP; - @JsonProperty("redirectRules") + @JsonProperty("matchExpressions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List redirectRules = new ArrayList<>(); + private List matchExpressions = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -69,43 +66,32 @@ public class RedirectConfig implements Editable , Kuberne * No args constructor for use in serialization * */ - public RedirectConfig() { + public ClusterResourceQuotaSpecQScopeSelector() { } - public RedirectConfig(String fallbackIP, List redirectRules) { + public ClusterResourceQuotaSpecQScopeSelector(List matchExpressions) { super(); - this.fallbackIP = fallbackIP; - this.redirectRules = redirectRules; + this.matchExpressions = matchExpressions; } - @JsonProperty("fallbackIP") - public String getFallbackIP() { - return fallbackIP; - } - - @JsonProperty("fallbackIP") - public void setFallbackIP(String fallbackIP) { - this.fallbackIP = fallbackIP; - } - - @JsonProperty("redirectRules") + @JsonProperty("matchExpressions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getRedirectRules() { - return redirectRules; + public List getMatchExpressions() { + return matchExpressions; } - @JsonProperty("redirectRules") - public void setRedirectRules(List redirectRules) { - this.redirectRules = redirectRules; + @JsonProperty("matchExpressions") + public void setMatchExpressions(List matchExpressions) { + this.matchExpressions = matchExpressions; } @JsonIgnore - public RedirectConfigBuilder edit() { - return new RedirectConfigBuilder(this); + public ClusterResourceQuotaSpecQScopeSelectorBuilder edit() { + return new ClusterResourceQuotaSpecQScopeSelectorBuilder(this); } @JsonIgnore - public RedirectConfigBuilder toBuilder() { + public ClusterResourceQuotaSpecQScopeSelectorBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterResourceQuotaSpecQuota.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterResourceQuotaSpecQuota.java new file mode 100644 index 00000000000..6271e3c3156 --- /dev/null +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterResourceQuotaSpecQuota.java @@ -0,0 +1,144 @@ + +package io.fabric8.openshift.api.model; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "hard", + "scopeSelector", + "scopes" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class ClusterResourceQuotaSpecQuota implements Editable , KubernetesResource +{ + + @JsonProperty("hard") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializerForMap.class) + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private Map hard = new LinkedHashMap<>(); + @JsonProperty("scopeSelector") + private ClusterResourceQuotaSpecQScopeSelector scopeSelector; + @JsonProperty("scopes") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List scopes = new ArrayList<>(); + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ClusterResourceQuotaSpecQuota() { + } + + public ClusterResourceQuotaSpecQuota(Map hard, ClusterResourceQuotaSpecQScopeSelector scopeSelector, List scopes) { + super(); + this.hard = hard; + this.scopeSelector = scopeSelector; + this.scopes = scopes; + } + + @JsonProperty("hard") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public Map getHard() { + return hard; + } + + @JsonProperty("hard") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializerForMap.class) + public void setHard(Map hard) { + this.hard = hard; + } + + @JsonProperty("scopeSelector") + public ClusterResourceQuotaSpecQScopeSelector getScopeSelector() { + return scopeSelector; + } + + @JsonProperty("scopeSelector") + public void setScopeSelector(ClusterResourceQuotaSpecQScopeSelector scopeSelector) { + this.scopeSelector = scopeSelector; + } + + @JsonProperty("scopes") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getScopes() { + return scopes; + } + + @JsonProperty("scopes") + public void setScopes(List scopes) { + this.scopes = scopes; + } + + @JsonIgnore + public ClusterResourceQuotaSpecQuotaBuilder edit() { + return new ClusterResourceQuotaSpecQuotaBuilder(this); + } + + @JsonIgnore + public ClusterResourceQuotaSpecQuotaBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterNetworkEntry.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterResourceQuotaSpecSelector.java similarity index 67% rename from kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterNetworkEntry.java rename to kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterResourceQuotaSpecSelector.java index dcc315dfb6c..245a2096d6c 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterNetworkEntry.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterResourceQuotaSpecSelector.java @@ -31,8 +31,8 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "CIDR", - "hostSubnetLength" + "annotations", + "labels" }) @ToString @EqualsAndHashCode @@ -52,13 +52,15 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ClusterNetworkEntry implements Editable , KubernetesResource +public class ClusterResourceQuotaSpecSelector implements Editable , KubernetesResource { - @JsonProperty("CIDR") - private String cidr; - @JsonProperty("hostSubnetLength") - private Integer hostSubnetLength; + @JsonProperty("annotations") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + private Object annotations; + @JsonProperty("labels") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + private Object labels; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -66,42 +68,44 @@ public class ClusterNetworkEntry implements Editable * No args constructor for use in serialization * */ - public ClusterNetworkEntry() { + public ClusterResourceQuotaSpecSelector() { } - public ClusterNetworkEntry(String cidr, Integer hostSubnetLength) { + public ClusterResourceQuotaSpecSelector(Object annotations, Object labels) { super(); - this.cidr = cidr; - this.hostSubnetLength = hostSubnetLength; + this.annotations = annotations; + this.labels = labels; } - @JsonProperty("CIDR") - public String getCidr() { - return cidr; + @JsonProperty("annotations") + public Object getAnnotations() { + return annotations; } - @JsonProperty("CIDR") - public void setCidr(String cidr) { - this.cidr = cidr; + @JsonProperty("annotations") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + public void setAnnotations(Object annotations) { + this.annotations = annotations; } - @JsonProperty("hostSubnetLength") - public Integer getHostSubnetLength() { - return hostSubnetLength; + @JsonProperty("labels") + public Object getLabels() { + return labels; } - @JsonProperty("hostSubnetLength") - public void setHostSubnetLength(Integer hostSubnetLength) { - this.hostSubnetLength = hostSubnetLength; + @JsonProperty("labels") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + public void setLabels(Object labels) { + this.labels = labels; } @JsonIgnore - public ClusterNetworkEntryBuilder edit() { - return new ClusterNetworkEntryBuilder(this); + public ClusterResourceQuotaSpecSelectorBuilder edit() { + return new ClusterResourceQuotaSpecSelectorBuilder(this); } @JsonIgnore - public ClusterNetworkEntryBuilder toBuilder() { + public ClusterResourceQuotaSpecSelectorBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterResourceQuotaStatus.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterResourceQuotaStatus.java index 974ea50f57c..baf1ef2fd44 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterResourceQuotaStatus.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterResourceQuotaStatus.java @@ -1,9 +1,7 @@ package io.fabric8.openshift.api.model; -import java.util.ArrayList; import java.util.LinkedHashMap; -import java.util.List; import java.util.Map; import javax.annotation.Generated; import com.fasterxml.jackson.annotation.JsonAnyGetter; @@ -23,7 +21,6 @@ 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.ResourceQuotaStatus; import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; @@ -59,10 +56,10 @@ public class ClusterResourceQuotaStatus implements Editable namespaces = new ArrayList<>(); + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + private Object namespaces; @JsonProperty("total") - private ResourceQuotaStatus total; + private ClusterResourceQuotaStatusTotal total; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -73,30 +70,30 @@ public class ClusterResourceQuotaStatus implements Editable namespaces, ResourceQuotaStatus total) { + public ClusterResourceQuotaStatus(Object namespaces, ClusterResourceQuotaStatusTotal total) { super(); this.namespaces = namespaces; this.total = total; } @JsonProperty("namespaces") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getNamespaces() { + public Object getNamespaces() { return namespaces; } @JsonProperty("namespaces") - public void setNamespaces(List namespaces) { + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + public void setNamespaces(Object namespaces) { this.namespaces = namespaces; } @JsonProperty("total") - public ResourceQuotaStatus getTotal() { + public ClusterResourceQuotaStatusTotal getTotal() { return total; } @JsonProperty("total") - public void setTotal(ResourceQuotaStatus total) { + public void setTotal(ClusterResourceQuotaStatusTotal total) { this.total = total; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ServiceAccountRestriction.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterResourceQuotaStatusTotal.java similarity index 67% rename from kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ServiceAccountRestriction.java rename to kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterResourceQuotaStatusTotal.java index ea09a3ebabb..53a4e851a7f 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ServiceAccountRestriction.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterResourceQuotaStatusTotal.java @@ -1,9 +1,7 @@ package io.fabric8.openshift.api.model; -import java.util.ArrayList; import java.util.LinkedHashMap; -import java.util.List; import java.util.Map; import javax.annotation.Generated; import com.fasterxml.jackson.annotation.JsonAnyGetter; @@ -33,8 +31,8 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "namespaces", - "serviceaccounts" + "hard", + "used" }) @ToString @EqualsAndHashCode @@ -54,15 +52,17 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ServiceAccountRestriction implements Editable , KubernetesResource +public class ClusterResourceQuotaStatusTotal implements Editable , KubernetesResource { - @JsonProperty("namespaces") + @JsonProperty("hard") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializerForMap.class) @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List namespaces = new ArrayList<>(); - @JsonProperty("serviceaccounts") + private Map hard = new LinkedHashMap<>(); + @JsonProperty("used") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializerForMap.class) @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List serviceaccounts = new ArrayList<>(); + private Map used = new LinkedHashMap<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -70,44 +70,46 @@ public class ServiceAccountRestriction implements Editable namespaces, List serviceaccounts) { + public ClusterResourceQuotaStatusTotal(Map hard, Map used) { super(); - this.namespaces = namespaces; - this.serviceaccounts = serviceaccounts; + this.hard = hard; + this.used = used; } - @JsonProperty("namespaces") + @JsonProperty("hard") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getNamespaces() { - return namespaces; + public Map getHard() { + return hard; } - @JsonProperty("namespaces") - public void setNamespaces(List namespaces) { - this.namespaces = namespaces; + @JsonProperty("hard") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializerForMap.class) + public void setHard(Map hard) { + this.hard = hard; } - @JsonProperty("serviceaccounts") + @JsonProperty("used") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getServiceaccounts() { - return serviceaccounts; + public Map getUsed() { + return used; } - @JsonProperty("serviceaccounts") - public void setServiceaccounts(List serviceaccounts) { - this.serviceaccounts = serviceaccounts; + @JsonProperty("used") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializerForMap.class) + public void setUsed(Map used) { + this.used = used; } @JsonIgnore - public ServiceAccountRestrictionBuilder edit() { - return new ServiceAccountRestrictionBuilder(this); + public ClusterResourceQuotaStatusTotalBuilder edit() { + return new ClusterResourceQuotaStatusTotalBuilder(this); } @JsonIgnore - public ServiceAccountRestrictionBuilder toBuilder() { + public ClusterResourceQuotaStatusTotalBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterRole.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterRole.java index cef870810eb..6607eb0c568 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterRole.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterRole.java @@ -19,6 +19,7 @@ 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.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -50,7 +51,7 @@ "" }) @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(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @@ -86,7 +87,7 @@ public class ClusterRole implements Editable , HasMetadata @JsonProperty("kind") private String kind = "ClusterRole"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("rules") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List rules = new ArrayList<>(); @@ -100,7 +101,7 @@ public class ClusterRole implements Editable , HasMetadata public ClusterRole() { } - public ClusterRole(AggregationRule aggregationRule, String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, List rules) { + public ClusterRole(AggregationRule aggregationRule, String apiVersion, String kind, ObjectMeta metadata, List rules) { super(); this.aggregationRule = aggregationRule; this.apiVersion = apiVersion; @@ -160,12 +161,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterRoleBinding.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterRoleBinding.java index 5e53ecb38cf..b8bdd33d76e 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterRoleBinding.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterRoleBinding.java @@ -19,6 +19,8 @@ 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.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; @@ -50,13 +52,13 @@ "" }) @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(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(ObjectReference.class), @BuildableReference(LocalObjectReference.class), @BuildableReference(PersistentVolumeClaim.class) }) @@ -87,12 +89,12 @@ public class ClusterRoleBinding implements Editable , @JsonProperty("kind") private String kind = "ClusterRoleBinding"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("roleRef") - private io.fabric8.kubernetes.api.model.ObjectReference roleRef; + private ObjectReference roleRef; @JsonProperty("subjects") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List subjects = new ArrayList<>(); + private List subjects = new ArrayList<>(); @JsonProperty("userNames") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List userNames = new ArrayList<>(); @@ -106,7 +108,7 @@ public class ClusterRoleBinding implements Editable , public ClusterRoleBinding() { } - public ClusterRoleBinding(String apiVersion, List groupNames, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, io.fabric8.kubernetes.api.model.ObjectReference roleRef, List subjects, List userNames) { + public ClusterRoleBinding(String apiVersion, List groupNames, String kind, ObjectMeta metadata, ObjectReference roleRef, List subjects, List userNames) { super(); this.apiVersion = apiVersion; this.groupNames = groupNames; @@ -169,33 +171,33 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } @JsonProperty("roleRef") - public io.fabric8.kubernetes.api.model.ObjectReference getRoleRef() { + public ObjectReference getRoleRef() { return roleRef; } @JsonProperty("roleRef") - public void setRoleRef(io.fabric8.kubernetes.api.model.ObjectReference roleRef) { + public void setRoleRef(ObjectReference roleRef) { this.roleRef = roleRef; } @JsonProperty("subjects") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getSubjects() { + public List getSubjects() { return subjects; } @JsonProperty("subjects") - public void setSubjects(List subjects) { + public void setSubjects(List subjects) { this.subjects = subjects; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ConfigMapBuildSource.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ConfigMapBuildSource.java index 4307d79802f..a3c4c665246 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ConfigMapBuildSource.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ConfigMapBuildSource.java @@ -16,6 +16,7 @@ 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; @@ -47,7 +48,7 @@ @BuildableReference(ResourceRequirements.class), @BuildableReference(IntOrString.class), @BuildableReference(ObjectReference.class), - @BuildableReference(io.fabric8.kubernetes.api.model.LocalObjectReference.class), + @BuildableReference(LocalObjectReference.class), @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") @@ -55,7 +56,7 @@ public class ConfigMapBuildSource implements Editable @JsonProperty("forcePull") private Boolean forcePull; @JsonProperty("from") - private io.fabric8.kubernetes.api.model.ObjectReference from; + private ObjectReference from; @JsonProperty("pullSecret") - private io.fabric8.kubernetes.api.model.LocalObjectReference pullSecret; + private LocalObjectReference pullSecret; @JsonProperty("secrets") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List secrets = new ArrayList<>(); @@ -87,7 +89,7 @@ public class CustomBuildStrategy implements Editable public CustomBuildStrategy() { } - public CustomBuildStrategy(String buildAPIVersion, List env, Boolean exposeDockerSocket, Boolean forcePull, io.fabric8.kubernetes.api.model.ObjectReference from, io.fabric8.kubernetes.api.model.LocalObjectReference pullSecret, List secrets) { + public CustomBuildStrategy(String buildAPIVersion, List env, Boolean exposeDockerSocket, Boolean forcePull, ObjectReference from, LocalObjectReference pullSecret, List secrets) { super(); this.buildAPIVersion = buildAPIVersion; this.env = env; @@ -140,22 +142,22 @@ public void setForcePull(Boolean forcePull) { } @JsonProperty("from") - public io.fabric8.kubernetes.api.model.ObjectReference getFrom() { + public ObjectReference getFrom() { return from; } @JsonProperty("from") - public void setFrom(io.fabric8.kubernetes.api.model.ObjectReference from) { + public void setFrom(ObjectReference from) { this.from = from; } @JsonProperty("pullSecret") - public io.fabric8.kubernetes.api.model.LocalObjectReference getPullSecret() { + public LocalObjectReference getPullSecret() { return pullSecret; } @JsonProperty("pullSecret") - public void setPullSecret(io.fabric8.kubernetes.api.model.LocalObjectReference pullSecret) { + public void setPullSecret(LocalObjectReference pullSecret) { this.pullSecret = pullSecret; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DeploymentCauseImageTrigger.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DeploymentCauseImageTrigger.java index e2d847ccba3..62c94cb133e 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DeploymentCauseImageTrigger.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DeploymentCauseImageTrigger.java @@ -18,6 +18,7 @@ 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; @@ -45,7 +46,7 @@ @BuildableReference(PodTemplateSpec.class), @BuildableReference(ResourceRequirements.class), @BuildableReference(IntOrString.class), - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class), + @BuildableReference(ObjectReference.class), @BuildableReference(LocalObjectReference.class), @BuildableReference(PersistentVolumeClaim.class) }) @@ -54,7 +55,7 @@ public class DeploymentCauseImageTrigger implements Editable additionalProperties = new LinkedHashMap(); @@ -65,18 +66,18 @@ public class DeploymentCauseImageTrigger implements Editable , Has @JsonProperty("kind") private String kind = "DeploymentConfig"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("spec") private DeploymentConfigSpec spec; @JsonProperty("status") @@ -97,7 +98,7 @@ public class DeploymentConfig implements Editable , Has public DeploymentConfig() { } - public DeploymentConfig(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, DeploymentConfigSpec spec, DeploymentConfigStatus status) { + public DeploymentConfig(String apiVersion, String kind, ObjectMeta metadata, DeploymentConfigSpec spec, DeploymentConfigStatus status) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -147,12 +148,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DeploymentConfigRollbackSpec.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DeploymentConfigRollbackSpec.java index 3a32caa07a0..d46c054ad51 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DeploymentConfigRollbackSpec.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DeploymentConfigRollbackSpec.java @@ -18,6 +18,7 @@ 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; @@ -50,7 +51,7 @@ @BuildableReference(PodTemplateSpec.class), @BuildableReference(ResourceRequirements.class), @BuildableReference(IntOrString.class), - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class), + @BuildableReference(ObjectReference.class), @BuildableReference(LocalObjectReference.class), @BuildableReference(PersistentVolumeClaim.class) }) @@ -59,7 +60,7 @@ public class DeploymentConfigRollbackSpec implements Editable selector, DeploymentStrategy strategy, io.fabric8.kubernetes.api.model.PodTemplateSpec template, Boolean test, List triggers) { + public DeploymentConfigSpec(Integer minReadySeconds, Boolean paused, Integer replicas, Integer revisionHistoryLimit, Map selector, DeploymentStrategy strategy, PodTemplateSpec template, Boolean test, List triggers) { super(); this.minReadySeconds = minReadySeconds; this.paused = paused; @@ -168,12 +169,12 @@ public void setStrategy(DeploymentStrategy strategy) { } @JsonProperty("template") - public io.fabric8.kubernetes.api.model.PodTemplateSpec getTemplate() { + public PodTemplateSpec getTemplate() { return template; } @JsonProperty("template") - public void setTemplate(io.fabric8.kubernetes.api.model.PodTemplateSpec template) { + public void setTemplate(PodTemplateSpec template) { this.template = template; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DeploymentLog.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DeploymentLog.java new file mode 100644 index 00000000000..e004932ef5d --- /dev/null +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DeploymentLog.java @@ -0,0 +1,161 @@ + +package io.fabric8.openshift.api.model; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +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.builder.Editable; +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.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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind" +}) +@ToString +@EqualsAndHashCode +@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("v1") +@Group("apps.openshift.io") +@Generated("jsonschema2pojo") +public class DeploymentLog implements Editable , KubernetesResource +{ + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + private String apiVersion = "apps.openshift.io/v1"; + /** + * + * (Required) + * + */ + @JsonProperty("kind") + private String kind = "DeploymentLog"; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public DeploymentLog() { + } + + public DeploymentLog(String apiVersion, String kind) { + super(); + this.apiVersion = apiVersion; + this.kind = kind; + } + + /** + * + * (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; + } + + @JsonIgnore + public DeploymentLogBuilder edit() { + return new DeploymentLogBuilder(this); + } + + @JsonIgnore + public DeploymentLogBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DeploymentRequest.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DeploymentRequest.java new file mode 100644 index 00000000000..30c30d2033f --- /dev/null +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DeploymentRequest.java @@ -0,0 +1,221 @@ + +package io.fabric8.openshift.api.model; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +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.builder.Editable; +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.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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "excludeTriggers", + "force", + "latest", + "name" +}) +@ToString +@EqualsAndHashCode +@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("v1") +@Group("apps.openshift.io") +@Generated("jsonschema2pojo") +public class DeploymentRequest implements Editable , KubernetesResource +{ + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + private String apiVersion = "apps.openshift.io/v1"; + @JsonProperty("excludeTriggers") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List excludeTriggers = new ArrayList<>(); + @JsonProperty("force") + private Boolean force; + /** + * + * (Required) + * + */ + @JsonProperty("kind") + private String kind = "DeploymentRequest"; + @JsonProperty("latest") + private Boolean latest; + @JsonProperty("name") + private String name; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public DeploymentRequest() { + } + + public DeploymentRequest(String apiVersion, List excludeTriggers, Boolean force, String kind, Boolean latest, String name) { + super(); + this.apiVersion = apiVersion; + this.excludeTriggers = excludeTriggers; + this.force = force; + this.kind = kind; + this.latest = latest; + this.name = name; + } + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + public String getApiVersion() { + return apiVersion; + } + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + public void setApiVersion(String apiVersion) { + this.apiVersion = apiVersion; + } + + @JsonProperty("excludeTriggers") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getExcludeTriggers() { + return excludeTriggers; + } + + @JsonProperty("excludeTriggers") + public void setExcludeTriggers(List excludeTriggers) { + this.excludeTriggers = excludeTriggers; + } + + @JsonProperty("force") + public Boolean getForce() { + return force; + } + + @JsonProperty("force") + public void setForce(Boolean force) { + this.force = force; + } + + /** + * + * (Required) + * + */ + @JsonProperty("kind") + public String getKind() { + return kind; + } + + /** + * + * (Required) + * + */ + @JsonProperty("kind") + public void setKind(String kind) { + this.kind = kind; + } + + @JsonProperty("latest") + public Boolean getLatest() { + return latest; + } + + @JsonProperty("latest") + public void setLatest(Boolean latest) { + this.latest = latest; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonIgnore + public DeploymentRequestBuilder edit() { + return new DeploymentRequestBuilder(this); + } + + @JsonIgnore + public DeploymentRequestBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DeploymentStrategy.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DeploymentStrategy.java index e32b9174dd5..7c22332cbd9 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DeploymentStrategy.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DeploymentStrategy.java @@ -21,6 +21,7 @@ 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; @@ -50,7 +51,7 @@ @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), - @BuildableReference(io.fabric8.kubernetes.api.model.ResourceRequirements.class), + @BuildableReference(ResourceRequirements.class), @BuildableReference(IntOrString.class), @BuildableReference(ObjectReference.class), @BuildableReference(LocalObjectReference.class), @@ -73,7 +74,7 @@ public class DeploymentStrategy implements Editable , @JsonProperty("recreateParams") private RecreateDeploymentStrategyParams recreateParams; @JsonProperty("resources") - private io.fabric8.kubernetes.api.model.ResourceRequirements resources; + private ResourceRequirements resources; @JsonProperty("rollingParams") private RollingDeploymentStrategyParams rollingParams; @JsonProperty("type") @@ -88,7 +89,7 @@ public class DeploymentStrategy implements Editable , public DeploymentStrategy() { } - public DeploymentStrategy(Long activeDeadlineSeconds, Map annotations, CustomDeploymentStrategyParams customParams, Map labels, RecreateDeploymentStrategyParams recreateParams, io.fabric8.kubernetes.api.model.ResourceRequirements resources, RollingDeploymentStrategyParams rollingParams, String type) { + public DeploymentStrategy(Long activeDeadlineSeconds, Map annotations, CustomDeploymentStrategyParams customParams, Map labels, RecreateDeploymentStrategyParams recreateParams, ResourceRequirements resources, RollingDeploymentStrategyParams rollingParams, String type) { super(); this.activeDeadlineSeconds = activeDeadlineSeconds; this.annotations = annotations; @@ -153,12 +154,12 @@ public void setRecreateParams(RecreateDeploymentStrategyParams recreateParams) { } @JsonProperty("resources") - public io.fabric8.kubernetes.api.model.ResourceRequirements getResources() { + public ResourceRequirements getResources() { return resources; } @JsonProperty("resources") - public void setResources(io.fabric8.kubernetes.api.model.ResourceRequirements resources) { + public void setResources(ResourceRequirements resources) { this.resources = resources; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DeploymentTriggerImageChangeParams.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DeploymentTriggerImageChangeParams.java index 94a45dd69ad..a87f82477ec 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DeploymentTriggerImageChangeParams.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DeploymentTriggerImageChangeParams.java @@ -20,6 +20,7 @@ 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; @@ -50,7 +51,7 @@ @BuildableReference(PodTemplateSpec.class), @BuildableReference(ResourceRequirements.class), @BuildableReference(IntOrString.class), - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class), + @BuildableReference(ObjectReference.class), @BuildableReference(LocalObjectReference.class), @BuildableReference(PersistentVolumeClaim.class) }) @@ -64,7 +65,7 @@ public class DeploymentTriggerImageChangeParams implements Editable containerNames = new ArrayList<>(); @JsonProperty("from") - private io.fabric8.kubernetes.api.model.ObjectReference from; + private ObjectReference from; @JsonProperty("lastTriggeredImage") private String lastTriggeredImage; @JsonIgnore @@ -77,7 +78,7 @@ public class DeploymentTriggerImageChangeParams implements Editable containerNames, io.fabric8.kubernetes.api.model.ObjectReference from, String lastTriggeredImage) { + public DeploymentTriggerImageChangeParams(Boolean automatic, List containerNames, ObjectReference from, String lastTriggeredImage) { super(); this.automatic = automatic; this.containerNames = containerNames; @@ -107,12 +108,12 @@ public void setContainerNames(List containerNames) { } @JsonProperty("from") - public io.fabric8.kubernetes.api.model.ObjectReference getFrom() { + public ObjectReference getFrom() { return from; } @JsonProperty("from") - public void setFrom(io.fabric8.kubernetes.api.model.ObjectReference from) { + public void setFrom(ObjectReference from) { this.from = from; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DockerBuildStrategy.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DockerBuildStrategy.java index d863a965d30..256885a6d14 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DockerBuildStrategy.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DockerBuildStrategy.java @@ -19,7 +19,9 @@ 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; @@ -55,8 +57,8 @@ @BuildableReference(PodTemplateSpec.class), @BuildableReference(ResourceRequirements.class), @BuildableReference(IntOrString.class), - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class), - @BuildableReference(io.fabric8.kubernetes.api.model.LocalObjectReference.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") @@ -74,13 +76,13 @@ public class DockerBuildStrategy implements Editable @JsonProperty("forcePull") private Boolean forcePull; @JsonProperty("from") - private io.fabric8.kubernetes.api.model.ObjectReference from; + private ObjectReference from; @JsonProperty("imageOptimizationPolicy") private String imageOptimizationPolicy; @JsonProperty("noCache") private Boolean noCache; @JsonProperty("pullSecret") - private io.fabric8.kubernetes.api.model.LocalObjectReference pullSecret; + private LocalObjectReference pullSecret; @JsonProperty("volumes") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List volumes = new ArrayList<>(); @@ -94,7 +96,7 @@ public class DockerBuildStrategy implements Editable public DockerBuildStrategy() { } - public DockerBuildStrategy(List buildArgs, String dockerfilePath, List env, Boolean forcePull, io.fabric8.kubernetes.api.model.ObjectReference from, String imageOptimizationPolicy, Boolean noCache, io.fabric8.kubernetes.api.model.LocalObjectReference pullSecret, List volumes) { + public DockerBuildStrategy(List buildArgs, String dockerfilePath, List env, Boolean forcePull, ObjectReference from, String imageOptimizationPolicy, Boolean noCache, LocalObjectReference pullSecret, List volumes) { super(); this.buildArgs = buildArgs; this.dockerfilePath = dockerfilePath; @@ -150,12 +152,12 @@ public void setForcePull(Boolean forcePull) { } @JsonProperty("from") - public io.fabric8.kubernetes.api.model.ObjectReference getFrom() { + public ObjectReference getFrom() { return from; } @JsonProperty("from") - public void setFrom(io.fabric8.kubernetes.api.model.ObjectReference from) { + public void setFrom(ObjectReference from) { this.from = from; } @@ -180,12 +182,12 @@ public void setNoCache(Boolean noCache) { } @JsonProperty("pullSecret") - public io.fabric8.kubernetes.api.model.LocalObjectReference getPullSecret() { + public LocalObjectReference getPullSecret() { return pullSecret; } @JsonProperty("pullSecret") - public void setPullSecret(io.fabric8.kubernetes.api.model.LocalObjectReference pullSecret) { + public void setPullSecret(LocalObjectReference pullSecret) { this.pullSecret = pullSecret; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/EgressNetworkPolicyPeer.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/EgressNetworkPolicyPeer.java deleted file mode 100644 index 804ffb49591..00000000000 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/EgressNetworkPolicyPeer.java +++ /dev/null @@ -1,122 +0,0 @@ - -package io.fabric8.openshift.api.model; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -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.builder.Editable; -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.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "cidrSelector", - "dnsName" -}) -@ToString -@EqualsAndHashCode -@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) -}) -@Generated("jsonschema2pojo") -public class EgressNetworkPolicyPeer implements Editable , KubernetesResource -{ - - @JsonProperty("cidrSelector") - private String cidrSelector; - @JsonProperty("dnsName") - private String dnsName; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public EgressNetworkPolicyPeer() { - } - - public EgressNetworkPolicyPeer(String cidrSelector, String dnsName) { - super(); - this.cidrSelector = cidrSelector; - this.dnsName = dnsName; - } - - @JsonProperty("cidrSelector") - public String getCidrSelector() { - return cidrSelector; - } - - @JsonProperty("cidrSelector") - public void setCidrSelector(String cidrSelector) { - this.cidrSelector = cidrSelector; - } - - @JsonProperty("dnsName") - public String getDnsName() { - return dnsName; - } - - @JsonProperty("dnsName") - public void setDnsName(String dnsName) { - this.dnsName = dnsName; - } - - @JsonIgnore - public EgressNetworkPolicyPeerBuilder edit() { - return new EgressNetworkPolicyPeerBuilder(this); - } - - @JsonIgnore - public EgressNetworkPolicyPeerBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Group.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Group.java index 2efb64e90cb..2d91deff2eb 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Group.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Group.java @@ -19,6 +19,7 @@ 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.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -47,7 +48,7 @@ "" }) @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(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @@ -81,7 +82,7 @@ public class Group implements Editable , HasMetadata @JsonProperty("kind") private String kind = "Group"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("users") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List users = new ArrayList<>(); @@ -95,7 +96,7 @@ public class Group implements Editable , HasMetadata public Group() { } - public Group(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, List users) { + public Group(String apiVersion, String kind, ObjectMeta metadata, List users) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -144,12 +145,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/GroupList.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/GroupList.java index c959da4d983..3f639b4538e 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/GroupList.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/GroupList.java @@ -26,6 +26,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.kubernetes.model.annotation.Group; import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; @@ -64,7 +65,7 @@ @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) }) @Version("v1") -@io.fabric8.kubernetes.model.annotation.Group("user.openshift.io") +@Group("user.openshift.io") @Generated("jsonschema2pojo") public class GroupList implements Editable , KubernetesResource, KubernetesResourceList { diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/HostSubnet.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/HostSubnet.java deleted file mode 100644 index 80d840fc16a..00000000000 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/HostSubnet.java +++ /dev/null @@ -1,250 +0,0 @@ - -package io.fabric8.openshift.api.model; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -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.builder.Editable; -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.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "egressCIDRs", - "egressIPs", - "host", - "hostIP", - "subnet" -}) -@ToString -@EqualsAndHashCode -@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("v1") -@Group("network.openshift.io") -@Generated("jsonschema2pojo") -public class HostSubnet implements Editable , HasMetadata -{ - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - private String apiVersion = "network.openshift.io/v1"; - @JsonProperty("egressCIDRs") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List egressCIDRs = new ArrayList<>(); - @JsonProperty("egressIPs") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List egressIPs = new ArrayList<>(); - @JsonProperty("host") - private String host; - @JsonProperty("hostIP") - private String hostIP; - /** - * - * (Required) - * - */ - @JsonProperty("kind") - private String kind = "HostSubnet"; - @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; - @JsonProperty("subnet") - private String subnet; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public HostSubnet() { - } - - public HostSubnet(String apiVersion, List egressCIDRs, List egressIPs, String host, String hostIP, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, String subnet) { - super(); - this.apiVersion = apiVersion; - this.egressCIDRs = egressCIDRs; - this.egressIPs = egressIPs; - this.host = host; - this.hostIP = hostIP; - this.kind = kind; - this.metadata = metadata; - this.subnet = subnet; - } - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - public String getApiVersion() { - return apiVersion; - } - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - public void setApiVersion(String apiVersion) { - this.apiVersion = apiVersion; - } - - @JsonProperty("egressCIDRs") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getEgressCIDRs() { - return egressCIDRs; - } - - @JsonProperty("egressCIDRs") - public void setEgressCIDRs(List egressCIDRs) { - this.egressCIDRs = egressCIDRs; - } - - @JsonProperty("egressIPs") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getEgressIPs() { - return egressIPs; - } - - @JsonProperty("egressIPs") - public void setEgressIPs(List egressIPs) { - this.egressIPs = egressIPs; - } - - @JsonProperty("host") - public String getHost() { - return host; - } - - @JsonProperty("host") - public void setHost(String host) { - this.host = host; - } - - @JsonProperty("hostIP") - public String getHostIP() { - return hostIP; - } - - @JsonProperty("hostIP") - public void setHostIP(String hostIP) { - this.hostIP = hostIP; - } - - /** - * - * (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("subnet") - public String getSubnet() { - return subnet; - } - - @JsonProperty("subnet") - public void setSubnet(String subnet) { - this.subnet = subnet; - } - - @JsonIgnore - public HostSubnetBuilder edit() { - return new HostSubnetBuilder(this); - } - - @JsonIgnore - public HostSubnetBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Identity.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Identity.java index afcdc88bb4c..073baf2b284 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Identity.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Identity.java @@ -17,6 +17,8 @@ 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.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; @@ -48,13 +50,13 @@ "" }) @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(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(ObjectReference.class), @BuildableReference(LocalObjectReference.class), @BuildableReference(PersistentVolumeClaim.class) }) @@ -85,13 +87,13 @@ public class Identity implements Editable , HasMetadata @JsonProperty("kind") private String kind = "Identity"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("providerName") private String providerName; @JsonProperty("providerUserName") private String providerUserName; @JsonProperty("user") - private io.fabric8.kubernetes.api.model.ObjectReference user; + private ObjectReference user; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -102,7 +104,7 @@ public class Identity implements Editable , HasMetadata public Identity() { } - public Identity(String apiVersion, Map extra, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, String providerName, String providerUserName, io.fabric8.kubernetes.api.model.ObjectReference user) { + public Identity(String apiVersion, Map extra, String kind, ObjectMeta metadata, String providerName, String providerUserName, ObjectReference user) { super(); this.apiVersion = apiVersion; this.extra = extra; @@ -165,12 +167,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } @@ -195,12 +197,12 @@ public void setProviderUserName(String providerUserName) { } @JsonProperty("user") - public io.fabric8.kubernetes.api.model.ObjectReference getUser() { + public ObjectReference getUser() { return user; } @JsonProperty("user") - public void setUser(io.fabric8.kubernetes.api.model.ObjectReference user) { + public void setUser(ObjectReference user) { this.user = user; } 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 d1215b77148..bbedeb7d52f 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 @@ -19,13 +19,13 @@ 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.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.fabric8.openshift.api.model.runtime.RawExtension; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; import io.sundr.transform.annotations.TemplateTransformation; @@ -58,7 +58,7 @@ "" }) @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(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @@ -97,7 +97,8 @@ public class Image implements Editable , HasMetadata @JsonInclude(JsonInclude.Include.NON_EMPTY) private List dockerImageManifests = new ArrayList<>(); @JsonProperty("dockerImageMetadata") - private RawExtension dockerImageMetadata; + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + private Object dockerImageMetadata; @JsonProperty("dockerImageMetadataVersion") private String dockerImageMetadataVersion; @JsonProperty("dockerImageReference") @@ -113,7 +114,7 @@ public class Image implements Editable , HasMetadata @JsonProperty("kind") private String kind = "Image"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("signatures") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List signatures = new ArrayList<>(); @@ -127,7 +128,7 @@ public class Image implements Editable , HasMetadata public Image() { } - 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) { + public Image(String apiVersion, String dockerImageConfig, List dockerImageLayers, String dockerImageManifest, String dockerImageManifestMediaType, List dockerImageManifests, Object dockerImageMetadata, String dockerImageMetadataVersion, String dockerImageReference, List dockerImageSignatures, String kind, ObjectMeta metadata, List signatures) { super(); this.apiVersion = apiVersion; this.dockerImageConfig = dockerImageConfig; @@ -217,12 +218,13 @@ public void setDockerImageManifests(List dockerImageManifests) { } @JsonProperty("dockerImageMetadata") - public RawExtension getDockerImageMetadata() { + public Object getDockerImageMetadata() { return dockerImageMetadata; } @JsonProperty("dockerImageMetadata") - public void setDockerImageMetadata(RawExtension dockerImageMetadata) { + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + public void setDockerImageMetadata(Object dockerImageMetadata) { this.dockerImageMetadata = dockerImageMetadata; } @@ -278,12 +280,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/UserRestriction.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageBlobReferences.java similarity index 62% rename from kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/UserRestriction.java rename to kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageBlobReferences.java index 4c96a60f2de..9afa8111ff3 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/UserRestriction.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageBlobReferences.java @@ -17,6 +17,7 @@ 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; @@ -32,9 +33,10 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "groups", - "labels", - "users" + "config", + "imageMissing", + "layers", + "manifests" }) @ToString @EqualsAndHashCode @@ -44,7 +46,7 @@ }) @Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { @BuildableReference(ObjectMeta.class), - @BuildableReference(io.fabric8.kubernetes.api.model.LabelSelector.class), + @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @BuildableReference(ResourceRequirements.class), @@ -54,18 +56,19 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class UserRestriction implements Editable , KubernetesResource +public class ImageBlobReferences implements Editable , KubernetesResource { - @JsonProperty("groups") + @JsonProperty("config") + private String config; + @JsonProperty("imageMissing") + private Boolean imageMissing; + @JsonProperty("layers") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List groups = new ArrayList<>(); - @JsonProperty("labels") + private List layers = new ArrayList<>(); + @JsonProperty("manifests") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List labels = new ArrayList<>(); - @JsonProperty("users") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List users = new ArrayList<>(); + private List manifests = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -73,56 +76,66 @@ public class UserRestriction implements Editable , Kuber * No args constructor for use in serialization * */ - public UserRestriction() { + public ImageBlobReferences() { } - public UserRestriction(List groups, List labels, List users) { + public ImageBlobReferences(String config, Boolean imageMissing, List layers, List manifests) { super(); - this.groups = groups; - this.labels = labels; - this.users = users; + this.config = config; + this.imageMissing = imageMissing; + this.layers = layers; + this.manifests = manifests; } - @JsonProperty("groups") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getGroups() { - return groups; + @JsonProperty("config") + public String getConfig() { + return config; + } + + @JsonProperty("config") + public void setConfig(String config) { + this.config = config; + } + + @JsonProperty("imageMissing") + public Boolean getImageMissing() { + return imageMissing; } - @JsonProperty("groups") - public void setGroups(List groups) { - this.groups = groups; + @JsonProperty("imageMissing") + public void setImageMissing(Boolean imageMissing) { + this.imageMissing = imageMissing; } - @JsonProperty("labels") + @JsonProperty("layers") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getLabels() { - return labels; + public List getLayers() { + return layers; } - @JsonProperty("labels") - public void setLabels(List labels) { - this.labels = labels; + @JsonProperty("layers") + public void setLayers(List layers) { + this.layers = layers; } - @JsonProperty("users") + @JsonProperty("manifests") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getUsers() { - return users; + public List getManifests() { + return manifests; } - @JsonProperty("users") - public void setUsers(List users) { - this.users = users; + @JsonProperty("manifests") + public void setManifests(List manifests) { + this.manifests = manifests; } @JsonIgnore - public UserRestrictionBuilder edit() { - return new UserRestrictionBuilder(this); + public ImageBlobReferencesBuilder edit() { + return new ImageBlobReferencesBuilder(this); } @JsonIgnore - public UserRestrictionBuilder toBuilder() { + public ImageBlobReferencesBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageChangeCause.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageChangeCause.java index a7b2f28e3a1..41450c693c3 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageChangeCause.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageChangeCause.java @@ -18,6 +18,7 @@ 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; @@ -46,7 +47,7 @@ @BuildableReference(PodTemplateSpec.class), @BuildableReference(ResourceRequirements.class), @BuildableReference(IntOrString.class), - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class), + @BuildableReference(ObjectReference.class), @BuildableReference(LocalObjectReference.class), @BuildableReference(PersistentVolumeClaim.class) }) @@ -55,7 +56,7 @@ public class ImageChangeCause implements Editable , Kub { @JsonProperty("fromRef") - private io.fabric8.kubernetes.api.model.ObjectReference fromRef; + private ObjectReference fromRef; @JsonProperty("imageID") private String imageID; @JsonIgnore @@ -68,19 +69,19 @@ public class ImageChangeCause implements Editable , Kub public ImageChangeCause() { } - public ImageChangeCause(io.fabric8.kubernetes.api.model.ObjectReference fromRef, String imageID) { + public ImageChangeCause(ObjectReference fromRef, String imageID) { super(); this.fromRef = fromRef; this.imageID = imageID; } @JsonProperty("fromRef") - public io.fabric8.kubernetes.api.model.ObjectReference getFromRef() { + public ObjectReference getFromRef() { return fromRef; } @JsonProperty("fromRef") - public void setFromRef(io.fabric8.kubernetes.api.model.ObjectReference fromRef) { + public void setFromRef(ObjectReference fromRef) { this.fromRef = fromRef; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageChangeTrigger.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageChangeTrigger.java index 639142a026a..450b2f699f4 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageChangeTrigger.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageChangeTrigger.java @@ -18,6 +18,7 @@ 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; @@ -47,7 +48,7 @@ @BuildableReference(PodTemplateSpec.class), @BuildableReference(ResourceRequirements.class), @BuildableReference(IntOrString.class), - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class), + @BuildableReference(ObjectReference.class), @BuildableReference(LocalObjectReference.class), @BuildableReference(PersistentVolumeClaim.class) }) @@ -56,7 +57,7 @@ public class ImageChangeTrigger implements Editable , { @JsonProperty("from") - private io.fabric8.kubernetes.api.model.ObjectReference from; + private ObjectReference from; @JsonProperty("lastTriggeredImageID") private String lastTriggeredImageID; @JsonProperty("paused") @@ -71,7 +72,7 @@ public class ImageChangeTrigger implements Editable , public ImageChangeTrigger() { } - public ImageChangeTrigger(io.fabric8.kubernetes.api.model.ObjectReference from, String lastTriggeredImageID, Boolean paused) { + public ImageChangeTrigger(ObjectReference from, String lastTriggeredImageID, Boolean paused) { super(); this.from = from; this.lastTriggeredImageID = lastTriggeredImageID; @@ -79,12 +80,12 @@ public ImageChangeTrigger(io.fabric8.kubernetes.api.model.ObjectReference from, } @JsonProperty("from") - public io.fabric8.kubernetes.api.model.ObjectReference getFrom() { + public ObjectReference getFrom() { return from; } @JsonProperty("from") - public void setFrom(io.fabric8.kubernetes.api.model.ObjectReference from) { + public void setFrom(ObjectReference from) { this.from = from; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageImportSpec.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageImportSpec.java index 7979bf1c499..13f97f36644 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageImportSpec.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageImportSpec.java @@ -16,7 +16,9 @@ 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; @@ -48,8 +50,8 @@ @BuildableReference(PodTemplateSpec.class), @BuildableReference(ResourceRequirements.class), @BuildableReference(IntOrString.class), - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class), - @BuildableReference(io.fabric8.kubernetes.api.model.LocalObjectReference.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") @@ -57,7 +59,7 @@ public class ImageImportSpec implements Editable , Kuber { @JsonProperty("from") - private io.fabric8.kubernetes.api.model.ObjectReference from; + private ObjectReference from; @JsonProperty("importPolicy") private TagImportPolicy importPolicy; @JsonProperty("includeManifest") @@ -65,7 +67,7 @@ public class ImageImportSpec implements Editable , Kuber @JsonProperty("referencePolicy") private TagReferencePolicy referencePolicy; @JsonProperty("to") - private io.fabric8.kubernetes.api.model.LocalObjectReference to; + private LocalObjectReference to; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -76,7 +78,7 @@ public class ImageImportSpec implements Editable , Kuber public ImageImportSpec() { } - public ImageImportSpec(io.fabric8.kubernetes.api.model.ObjectReference from, TagImportPolicy importPolicy, Boolean includeManifest, TagReferencePolicy referencePolicy, io.fabric8.kubernetes.api.model.LocalObjectReference to) { + public ImageImportSpec(ObjectReference from, TagImportPolicy importPolicy, Boolean includeManifest, TagReferencePolicy referencePolicy, LocalObjectReference to) { super(); this.from = from; this.importPolicy = importPolicy; @@ -86,12 +88,12 @@ public ImageImportSpec(io.fabric8.kubernetes.api.model.ObjectReference from, Tag } @JsonProperty("from") - public io.fabric8.kubernetes.api.model.ObjectReference getFrom() { + public ObjectReference getFrom() { return from; } @JsonProperty("from") - public void setFrom(io.fabric8.kubernetes.api.model.ObjectReference from) { + public void setFrom(ObjectReference from) { this.from = from; } @@ -126,12 +128,12 @@ public void setReferencePolicy(TagReferencePolicy referencePolicy) { } @JsonProperty("to") - public io.fabric8.kubernetes.api.model.LocalObjectReference getTo() { + public LocalObjectReference getTo() { return to; } @JsonProperty("to") - public void setTo(io.fabric8.kubernetes.api.model.LocalObjectReference to) { + public void setTo(LocalObjectReference to) { this.to = to; } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/MacvlanConfig.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageLayerData.java similarity index 75% rename from kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/MacvlanConfig.java rename to kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageLayerData.java index 062939622d8..a0eed588684 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/MacvlanConfig.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageLayerData.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.miscellaneous.network.operator.v1; +package io.fabric8.openshift.api.model; import java.util.LinkedHashMap; import java.util.Map; @@ -31,8 +31,8 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "master", - "mode" + "mediaType", + "size" }) @ToString @EqualsAndHashCode @@ -52,13 +52,13 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class MacvlanConfig implements Editable , KubernetesResource +public class ImageLayerData implements Editable , KubernetesResource { - @JsonProperty("master") - private String master; - @JsonProperty("mode") - private String mode; + @JsonProperty("mediaType") + private String mediaType; + @JsonProperty("size") + private Long size; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -66,42 +66,42 @@ public class MacvlanConfig implements Editable , Kubernete * No args constructor for use in serialization * */ - public MacvlanConfig() { + public ImageLayerData() { } - public MacvlanConfig(String master, String mode) { + public ImageLayerData(String mediaType, Long size) { super(); - this.master = master; - this.mode = mode; + this.mediaType = mediaType; + this.size = size; } - @JsonProperty("master") - public String getMaster() { - return master; + @JsonProperty("mediaType") + public String getMediaType() { + return mediaType; } - @JsonProperty("master") - public void setMaster(String master) { - this.master = master; + @JsonProperty("mediaType") + public void setMediaType(String mediaType) { + this.mediaType = mediaType; } - @JsonProperty("mode") - public String getMode() { - return mode; + @JsonProperty("size") + public Long getSize() { + return size; } - @JsonProperty("mode") - public void setMode(String mode) { - this.mode = mode; + @JsonProperty("size") + public void setSize(Long size) { + this.size = size; } @JsonIgnore - public MacvlanConfigBuilder edit() { - return new MacvlanConfigBuilder(this); + public ImageLayerDataBuilder edit() { + return new ImageLayerDataBuilder(this); } @JsonIgnore - public MacvlanConfigBuilder toBuilder() { + public ImageLayerDataBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageSignature.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageSignature.java index 3318e308c6b..7dd0ebfb240 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageSignature.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageSignature.java @@ -19,6 +19,7 @@ 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.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -55,7 +56,7 @@ "" }) @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(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @@ -102,7 +103,7 @@ public class ImageSignature implements Editable , HasMeta @JsonProperty("kind") private String kind = "ImageSignature"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("signedClaims") @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map signedClaims = new LinkedHashMap<>(); @@ -118,7 +119,7 @@ public class ImageSignature implements Editable , HasMeta public ImageSignature() { } - public ImageSignature(String apiVersion, List conditions, String content, String created, String imageIdentity, SignatureIssuer issuedBy, SignatureSubject issuedTo, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, Map signedClaims, String type) { + public ImageSignature(String apiVersion, List conditions, String content, String created, String imageIdentity, SignatureIssuer issuedBy, SignatureSubject issuedTo, String kind, ObjectMeta metadata, Map signedClaims, String type) { super(); this.apiVersion = apiVersion; this.conditions = conditions; @@ -235,12 +236,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageSource.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageSource.java index 00c46cf3c23..05e52e48a50 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageSource.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageSource.java @@ -18,7 +18,9 @@ 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; @@ -49,8 +51,8 @@ @BuildableReference(PodTemplateSpec.class), @BuildableReference(ResourceRequirements.class), @BuildableReference(IntOrString.class), - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class), - @BuildableReference(io.fabric8.kubernetes.api.model.LocalObjectReference.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") @@ -61,12 +63,12 @@ public class ImageSource implements Editable , KubernetesRes @JsonInclude(JsonInclude.Include.NON_EMPTY) private List as = new ArrayList<>(); @JsonProperty("from") - private io.fabric8.kubernetes.api.model.ObjectReference from; + private ObjectReference from; @JsonProperty("paths") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List paths = new ArrayList<>(); @JsonProperty("pullSecret") - private io.fabric8.kubernetes.api.model.LocalObjectReference pullSecret; + private LocalObjectReference pullSecret; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -77,7 +79,7 @@ public class ImageSource implements Editable , KubernetesRes public ImageSource() { } - public ImageSource(List as, io.fabric8.kubernetes.api.model.ObjectReference from, List paths, io.fabric8.kubernetes.api.model.LocalObjectReference pullSecret) { + public ImageSource(List as, ObjectReference from, List paths, LocalObjectReference pullSecret) { super(); this.as = as; this.from = from; @@ -97,12 +99,12 @@ public void setAs(List as) { } @JsonProperty("from") - public io.fabric8.kubernetes.api.model.ObjectReference getFrom() { + public ObjectReference getFrom() { return from; } @JsonProperty("from") - public void setFrom(io.fabric8.kubernetes.api.model.ObjectReference from) { + public void setFrom(ObjectReference from) { this.from = from; } @@ -118,12 +120,12 @@ public void setPaths(List paths) { } @JsonProperty("pullSecret") - public io.fabric8.kubernetes.api.model.LocalObjectReference getPullSecret() { + public LocalObjectReference getPullSecret() { return pullSecret; } @JsonProperty("pullSecret") - public void setPullSecret(io.fabric8.kubernetes.api.model.LocalObjectReference pullSecret) { + public void setPullSecret(LocalObjectReference pullSecret) { this.pullSecret = pullSecret; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageStream.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageStream.java index 6d160fa71e9..def8a0427f6 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageStream.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageStream.java @@ -18,6 +18,7 @@ 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.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -48,7 +49,7 @@ "" }) @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(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @@ -82,7 +83,7 @@ public class ImageStream implements Editable , HasMetadata, @JsonProperty("kind") private String kind = "ImageStream"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("spec") private ImageStreamSpec spec; @JsonProperty("status") @@ -97,7 +98,7 @@ public class ImageStream implements Editable , HasMetadata, public ImageStream() { } - public ImageStream(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, ImageStreamSpec spec, ImageStreamStatus status) { + public ImageStream(String apiVersion, String kind, ObjectMeta metadata, ImageStreamSpec spec, ImageStreamStatus status) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -147,12 +148,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageStreamImage.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageStreamImage.java index 793700d5916..2983d9b1b55 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageStreamImage.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageStreamImage.java @@ -18,6 +18,7 @@ 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.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -47,7 +48,7 @@ "" }) @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(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @@ -83,7 +84,7 @@ public class ImageStreamImage implements Editable , Has @JsonProperty("kind") private String kind = "ImageStreamImage"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -94,7 +95,7 @@ public class ImageStreamImage implements Editable , Has public ImageStreamImage() { } - public ImageStreamImage(String apiVersion, Image image, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public ImageStreamImage(String apiVersion, Image image, String kind, ObjectMeta metadata) { super(); this.apiVersion = apiVersion; this.image = image; @@ -153,12 +154,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageStreamImport.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageStreamImport.java index 1aa304d2fa4..f47f4cc2238 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageStreamImport.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageStreamImport.java @@ -18,6 +18,7 @@ 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.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -48,7 +49,7 @@ "" }) @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(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @@ -82,7 +83,7 @@ public class ImageStreamImport implements Editable , H @JsonProperty("kind") private String kind = "ImageStreamImport"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("spec") private ImageStreamImportSpec spec; @JsonProperty("status") @@ -97,7 +98,7 @@ public class ImageStreamImport implements Editable , H public ImageStreamImport() { } - public ImageStreamImport(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, ImageStreamImportSpec spec, ImageStreamImportStatus status) { + public ImageStreamImport(String apiVersion, String kind, ObjectMeta metadata, ImageStreamImportSpec spec, ImageStreamImportStatus status) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -147,12 +148,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/EgressNetworkPolicyList.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageStreamLayers.java similarity index 73% rename from kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/EgressNetworkPolicyList.java rename to kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageStreamLayers.java index fa6cde94107..901123301d3 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/EgressNetworkPolicyList.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageStreamLayers.java @@ -1,9 +1,7 @@ package io.fabric8.openshift.api.model; -import java.util.ArrayList; import java.util.LinkedHashMap; -import java.util.List; import java.util.Map; import javax.annotation.Generated; import com.fasterxml.jackson.annotation.JsonAnyGetter; @@ -15,12 +13,11 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.fabric8.kubernetes.api.builder.Editable; 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.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.Namespaced; import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; @@ -42,7 +39,8 @@ "apiVersion", "kind", "metadata", - "items" + "blobs", + "images" }) @ToString @EqualsAndHashCode @@ -65,9 +63,9 @@ @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) }) @Version("v1") -@Group("network.openshift.io") +@Group("image.openshift.io") @Generated("jsonschema2pojo") -public class EgressNetworkPolicyList implements Editable , KubernetesResource, KubernetesResourceList +public class ImageStreamLayers implements Editable , HasMetadata, Namespaced { /** @@ -76,19 +74,22 @@ public class EgressNetworkPolicyList implements Editable items = new ArrayList<>(); + private Map blobs = new LinkedHashMap<>(); + @JsonProperty("images") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private Map images = new LinkedHashMap<>(); /** * * (Required) * */ @JsonProperty("kind") - private String kind = "EgressNetworkPolicyList"; + private String kind = "ImageStreamLayers"; @JsonProperty("metadata") - private ListMeta metadata; + private ObjectMeta metadata; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -96,13 +97,14 @@ public class EgressNetworkPolicyList implements Editable items, String kind, ListMeta metadata) { + public ImageStreamLayers(String apiVersion, Map blobs, Map images, String kind, ObjectMeta metadata) { super(); this.apiVersion = apiVersion; - this.items = items; + this.blobs = blobs; + this.images = images; this.kind = kind; this.metadata = metadata; } @@ -127,15 +129,26 @@ public void setApiVersion(String apiVersion) { this.apiVersion = apiVersion; } - @JsonProperty("items") + @JsonProperty("blobs") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public Map getBlobs() { + return blobs; + } + + @JsonProperty("blobs") + public void setBlobs(Map blobs) { + this.blobs = blobs; + } + + @JsonProperty("images") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getItems() { - return items; + public Map getImages() { + return images; } - @JsonProperty("items") - public void setItems(List items) { - this.items = items; + @JsonProperty("images") + public void setImages(Map images) { + this.images = images; } /** @@ -159,22 +172,22 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public ListMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(ListMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } @JsonIgnore - public EgressNetworkPolicyListBuilder edit() { - return new EgressNetworkPolicyListBuilder(this); + public ImageStreamLayersBuilder edit() { + return new ImageStreamLayersBuilder(this); } @JsonIgnore - public EgressNetworkPolicyListBuilder toBuilder() { + public ImageStreamLayersBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageStreamMapping.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageStreamMapping.java index af0b7276ef8..3b998e729cc 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageStreamMapping.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageStreamMapping.java @@ -18,6 +18,7 @@ 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.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -48,7 +49,7 @@ "" }) @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(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @@ -84,7 +85,7 @@ public class ImageStreamMapping implements Editable , @JsonProperty("kind") private String kind = "ImageStreamMapping"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("tag") private String tag; @JsonIgnore @@ -97,7 +98,7 @@ public class ImageStreamMapping implements Editable , public ImageStreamMapping() { } - public ImageStreamMapping(String apiVersion, Image image, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, String tag) { + public ImageStreamMapping(String apiVersion, Image image, String kind, ObjectMeta metadata, String tag) { super(); this.apiVersion = apiVersion; this.image = image; @@ -157,12 +158,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageStreamTag.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageStreamTag.java index 908fddc94fc..6a78f3a7823 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageStreamTag.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageStreamTag.java @@ -20,6 +20,7 @@ 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.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -53,7 +54,7 @@ "" }) @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(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @@ -96,7 +97,7 @@ public class ImageStreamTag implements Editable , HasMeta @JsonProperty("lookupPolicy") private ImageLookupPolicy lookupPolicy; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("tag") private TagReference tag; @JsonIgnore @@ -109,7 +110,7 @@ public class ImageStreamTag implements Editable , HasMeta public ImageStreamTag() { } - public ImageStreamTag(String apiVersion, List conditions, Long generation, Image image, String kind, ImageLookupPolicy lookupPolicy, io.fabric8.kubernetes.api.model.ObjectMeta metadata, TagReference tag) { + public ImageStreamTag(String apiVersion, List conditions, Long generation, Image image, String kind, ImageLookupPolicy lookupPolicy, ObjectMeta metadata, TagReference tag) { super(); this.apiVersion = apiVersion; this.conditions = conditions; @@ -203,12 +204,12 @@ public void setLookupPolicy(ImageLookupPolicy lookupPolicy) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageTag.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageTag.java index 64b4e8f5817..d553d524dcf 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageTag.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageTag.java @@ -18,6 +18,7 @@ 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.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -49,7 +50,7 @@ "" }) @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(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @@ -85,7 +86,7 @@ public class ImageTag implements Editable , HasMetadata, Namesp @JsonProperty("kind") private String kind = "ImageTag"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("spec") private TagReference spec; @JsonProperty("status") @@ -100,7 +101,7 @@ public class ImageTag implements Editable , HasMetadata, Namesp public ImageTag() { } - public ImageTag(String apiVersion, Image image, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, TagReference spec, NamedTagEventList status) { + public ImageTag(String apiVersion, Image image, String kind, ObjectMeta metadata, TagReference spec, NamedTagEventList status) { super(); this.apiVersion = apiVersion; this.image = image; @@ -161,12 +162,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/LocalObjectReference.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/LocalObjectReference.java new file mode 100644 index 00000000000..1998aa6b6fb --- /dev/null +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/LocalObjectReference.java @@ -0,0 +1,107 @@ + +package io.fabric8.openshift.api.model; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "name" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class LocalObjectReference implements Editable , KubernetesResource +{ + + @JsonProperty("name") + private String name; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public LocalObjectReference() { + } + + public LocalObjectReference(String name) { + super(); + this.name = name; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonIgnore + public LocalObjectReferenceBuilder edit() { + return new LocalObjectReferenceBuilder(this); + } + + @JsonIgnore + public LocalObjectReferenceBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/LocalResourceAccessReview.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/LocalResourceAccessReview.java index 3aa3d7c6f81..5824c4298fb 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/LocalResourceAccessReview.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/LocalResourceAccessReview.java @@ -13,18 +13,15 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.fabric8.kubernetes.api.builder.Editable; import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.GenericKubernetesResource; 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.Namespaced; 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.runtime.RawExtension; import io.fabric8.kubernetes.model.annotation.Group; import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; @@ -65,9 +62,7 @@ @BuildableReference(IntOrString.class), @BuildableReference(ObjectReference.class), @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class), - @BuildableReference(GenericKubernetesResource.class), - @BuildableReference(RawExtension.class) + @BuildableReference(PersistentVolumeClaim.class) }) @TemplateTransformations({ @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) @@ -75,7 +70,7 @@ @Version("v1") @Group("authorization.openshift.io") @Generated("jsonschema2pojo") -public class LocalResourceAccessReview implements Editable , KubernetesResource, Namespaced +public class LocalResourceAccessReview implements Editable , KubernetesResource { /** @@ -86,7 +81,8 @@ public class LocalResourceAccessReview implements Editable , KubernetesResource, Namespaced +public class LocalSubjectAccessReview implements Editable , KubernetesResource { /** @@ -91,7 +86,8 @@ public class LocalSubjectAccessReview implements Editable groups = new ArrayList<>(); @@ -133,7 +129,7 @@ public class LocalSubjectAccessReview implements Editable groups, Boolean isNonResourceURL, String kind, String namespace, String path, String resource, String resourceAPIGroup, String resourceAPIVersion, String resourceName, List scopes, String user, String verb) { + public LocalSubjectAccessReview(String apiVersion, Object content, List groups, Boolean isNonResourceURL, String kind, String namespace, String path, String resource, String resourceAPIGroup, String resourceAPIVersion, String resourceName, List scopes, String user, String verb) { super(); this.apiVersion = apiVersion; this.content = content; @@ -172,12 +168,13 @@ public void setApiVersion(String apiVersion) { } @JsonProperty("content") - public KubernetesResource getContent() { + public Object getContent() { return content; } @JsonProperty("content") - public void setContent(KubernetesResource content) { + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + public void setContent(Object content) { this.content = content; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/NetNamespace.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/NetNamespace.java deleted file mode 100644 index beff3165ae4..00000000000 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/NetNamespace.java +++ /dev/null @@ -1,220 +0,0 @@ - -package io.fabric8.openshift.api.model; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -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.builder.Editable; -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.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "egressIPs", - "netid", - "netname" -}) -@ToString -@EqualsAndHashCode -@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("v1") -@Group("network.openshift.io") -@Generated("jsonschema2pojo") -public class NetNamespace implements Editable , HasMetadata -{ - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - private String apiVersion = "network.openshift.io/v1"; - @JsonProperty("egressIPs") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List egressIPs = new ArrayList<>(); - /** - * - * (Required) - * - */ - @JsonProperty("kind") - private String kind = "NetNamespace"; - @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; - @JsonProperty("netid") - private Integer netid; - @JsonProperty("netname") - private String netname; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public NetNamespace() { - } - - public NetNamespace(String apiVersion, List egressIPs, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, Integer netid, String netname) { - super(); - this.apiVersion = apiVersion; - this.egressIPs = egressIPs; - this.kind = kind; - this.metadata = metadata; - this.netid = netid; - this.netname = netname; - } - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - public String getApiVersion() { - return apiVersion; - } - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - public void setApiVersion(String apiVersion) { - this.apiVersion = apiVersion; - } - - @JsonProperty("egressIPs") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getEgressIPs() { - return egressIPs; - } - - @JsonProperty("egressIPs") - public void setEgressIPs(List egressIPs) { - this.egressIPs = egressIPs; - } - - /** - * - * (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("netid") - public Integer getNetid() { - return netid; - } - - @JsonProperty("netid") - public void setNetid(Integer netid) { - this.netid = netid; - } - - @JsonProperty("netname") - public String getNetname() { - return netname; - } - - @JsonProperty("netname") - public void setNetname(String netname) { - this.netname = netname; - } - - @JsonIgnore - public NetNamespaceBuilder edit() { - return new NetNamespaceBuilder(this); - } - - @JsonIgnore - public NetNamespaceBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuthAccessToken.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuthAccessToken.java index f1ce4a6869b..2f92219706c 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuthAccessToken.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuthAccessToken.java @@ -19,6 +19,7 @@ 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.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -56,7 +57,7 @@ "" }) @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(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @@ -98,7 +99,7 @@ public class OAuthAccessToken implements Editable , Has @JsonProperty("kind") private String kind = "OAuthAccessToken"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("redirectURI") private String redirectURI; @JsonProperty("refreshToken") @@ -120,7 +121,7 @@ public class OAuthAccessToken implements Editable , Has public OAuthAccessToken() { } - public OAuthAccessToken(String apiVersion, String authorizeToken, String clientName, Long expiresIn, Integer inactivityTimeoutSeconds, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, String redirectURI, String refreshToken, List scopes, String userName, String userUID) { + public OAuthAccessToken(String apiVersion, String authorizeToken, String clientName, Long expiresIn, Integer inactivityTimeoutSeconds, String kind, ObjectMeta metadata, String redirectURI, String refreshToken, List scopes, String userName, String userUID) { super(); this.apiVersion = apiVersion; this.authorizeToken = authorizeToken; @@ -217,12 +218,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuthAuthorizeToken.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuthAuthorizeToken.java index e12d90cb33b..60ee615cd1d 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuthAuthorizeToken.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuthAuthorizeToken.java @@ -19,6 +19,7 @@ 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.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -56,7 +57,7 @@ "" }) @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(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @@ -98,7 +99,7 @@ public class OAuthAuthorizeToken implements Editable @JsonProperty("kind") private String kind = "OAuthAuthorizeToken"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("redirectURI") private String redirectURI; @JsonProperty("scopes") @@ -120,7 +121,7 @@ public class OAuthAuthorizeToken implements Editable public OAuthAuthorizeToken() { } - public OAuthAuthorizeToken(String apiVersion, String clientName, String codeChallenge, String codeChallengeMethod, Long expiresIn, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, String redirectURI, List scopes, String state, String userName, String userUID) { + public OAuthAuthorizeToken(String apiVersion, String clientName, String codeChallenge, String codeChallengeMethod, Long expiresIn, String kind, ObjectMeta metadata, String redirectURI, List scopes, String state, String userName, String userUID) { super(); this.apiVersion = apiVersion; this.clientName = clientName; @@ -217,12 +218,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuthClient.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuthClient.java index 98513f9a5f1..8f5b56d5230 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuthClient.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuthClient.java @@ -19,6 +19,7 @@ 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.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -55,7 +56,7 @@ "" }) @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(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @@ -98,7 +99,7 @@ public class OAuthClient implements Editable , HasMetadata @JsonProperty("kind") private String kind = "OAuthClient"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("redirectURIs") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List redirectURIs = new ArrayList<>(); @@ -119,7 +120,7 @@ public class OAuthClient implements Editable , HasMetadata public OAuthClient() { } - public OAuthClient(Integer accessTokenInactivityTimeoutSeconds, Integer accessTokenMaxAgeSeconds, List additionalSecrets, String apiVersion, String grantMethod, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, List redirectURIs, Boolean respondWithChallenges, List scopeRestrictions, String secret) { + public OAuthClient(Integer accessTokenInactivityTimeoutSeconds, Integer accessTokenMaxAgeSeconds, List additionalSecrets, String apiVersion, String grantMethod, String kind, ObjectMeta metadata, List redirectURIs, Boolean respondWithChallenges, List scopeRestrictions, String secret) { super(); this.accessTokenInactivityTimeoutSeconds = accessTokenInactivityTimeoutSeconds; this.accessTokenMaxAgeSeconds = accessTokenMaxAgeSeconds; @@ -216,12 +217,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuthClientAuthorization.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuthClientAuthorization.java index a468e1ae2f9..145c0686343 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuthClientAuthorization.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuthClientAuthorization.java @@ -19,6 +19,7 @@ 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.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -51,7 +52,7 @@ "" }) @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(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @@ -87,7 +88,7 @@ public class OAuthClientAuthorization implements Editable scopes = new ArrayList<>(); @@ -105,7 +106,7 @@ public class OAuthClientAuthorization implements Editable scopes, String userName, String userUID) { + public OAuthClientAuthorization(String apiVersion, String clientName, String kind, ObjectMeta metadata, List scopes, String userName, String userUID) { super(); this.apiVersion = apiVersion; this.clientName = clientName; @@ -167,12 +168,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/PodSecurityPolicyReview.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/PodSecurityPolicyReview.java index cf12cfaf2a5..01c249f8992 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/PodSecurityPolicyReview.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/PodSecurityPolicyReview.java @@ -17,7 +17,6 @@ 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.Namespaced; import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; @@ -64,7 +63,7 @@ @Version("v1") @Group("security.openshift.io") @Generated("jsonschema2pojo") -public class PodSecurityPolicyReview implements Editable , KubernetesResource, Namespaced +public class PodSecurityPolicyReview implements Editable , KubernetesResource { /** diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/PodSecurityPolicyReviewSpec.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/PodSecurityPolicyReviewSpec.java index c6f4c060760..25dadf18644 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/PodSecurityPolicyReviewSpec.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/PodSecurityPolicyReviewSpec.java @@ -22,6 +22,7 @@ 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; @@ -45,7 +46,7 @@ @BuildableReference(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), - @BuildableReference(io.fabric8.kubernetes.api.model.PodTemplateSpec.class), + @BuildableReference(PodTemplateSpec.class), @BuildableReference(ResourceRequirements.class), @BuildableReference(IntOrString.class), @BuildableReference(ObjectReference.class), @@ -60,7 +61,7 @@ public class PodSecurityPolicyReviewSpec implements Editable serviceAccountNames = new ArrayList<>(); @JsonProperty("template") - private io.fabric8.kubernetes.api.model.PodTemplateSpec template; + private PodTemplateSpec template; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -71,7 +72,7 @@ public class PodSecurityPolicyReviewSpec implements Editable serviceAccountNames, io.fabric8.kubernetes.api.model.PodTemplateSpec template) { + public PodSecurityPolicyReviewSpec(List serviceAccountNames, PodTemplateSpec template) { super(); this.serviceAccountNames = serviceAccountNames; this.template = template; @@ -89,12 +90,12 @@ public void setServiceAccountNames(List serviceAccountNames) { } @JsonProperty("template") - public io.fabric8.kubernetes.api.model.PodTemplateSpec getTemplate() { + public PodTemplateSpec getTemplate() { return template; } @JsonProperty("template") - public void setTemplate(io.fabric8.kubernetes.api.model.PodTemplateSpec template) { + public void setTemplate(PodTemplateSpec template) { this.template = template; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/PodSecurityPolicySelfSubjectReview.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/PodSecurityPolicySelfSubjectReview.java index 39b0aa548fb..1b3b4715d77 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/PodSecurityPolicySelfSubjectReview.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/PodSecurityPolicySelfSubjectReview.java @@ -17,7 +17,6 @@ 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.Namespaced; import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; @@ -64,7 +63,7 @@ @Version("v1") @Group("security.openshift.io") @Generated("jsonschema2pojo") -public class PodSecurityPolicySelfSubjectReview implements Editable , KubernetesResource, Namespaced +public class PodSecurityPolicySelfSubjectReview implements Editable , KubernetesResource { /** diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/PodSecurityPolicySelfSubjectReviewSpec.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/PodSecurityPolicySelfSubjectReviewSpec.java index 5dff05f4a37..b29d719fb35 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/PodSecurityPolicySelfSubjectReviewSpec.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/PodSecurityPolicySelfSubjectReviewSpec.java @@ -20,6 +20,7 @@ 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; @@ -42,7 +43,7 @@ @BuildableReference(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), - @BuildableReference(io.fabric8.kubernetes.api.model.PodTemplateSpec.class), + @BuildableReference(PodTemplateSpec.class), @BuildableReference(ResourceRequirements.class), @BuildableReference(IntOrString.class), @BuildableReference(ObjectReference.class), @@ -54,7 +55,7 @@ public class PodSecurityPolicySelfSubjectReviewSpec implements Editable additionalProperties = new LinkedHashMap(); @@ -65,18 +66,18 @@ public class PodSecurityPolicySelfSubjectReviewSpec implements Editable , KubernetesResource, Namespaced +public class PodSecurityPolicySubjectReview implements Editable , KubernetesResource { /** diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/PodSecurityPolicySubjectReviewSpec.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/PodSecurityPolicySubjectReviewSpec.java index fcc231e9952..549d535c20c 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/PodSecurityPolicySubjectReviewSpec.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/PodSecurityPolicySubjectReviewSpec.java @@ -22,6 +22,7 @@ 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; @@ -46,7 +47,7 @@ @BuildableReference(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), - @BuildableReference(io.fabric8.kubernetes.api.model.PodTemplateSpec.class), + @BuildableReference(PodTemplateSpec.class), @BuildableReference(ResourceRequirements.class), @BuildableReference(IntOrString.class), @BuildableReference(ObjectReference.class), @@ -61,7 +62,7 @@ public class PodSecurityPolicySubjectReviewSpec implements Editable groups = new ArrayList<>(); @JsonProperty("template") - private io.fabric8.kubernetes.api.model.PodTemplateSpec template; + private PodTemplateSpec template; @JsonProperty("user") private String user; @JsonIgnore @@ -74,7 +75,7 @@ public class PodSecurityPolicySubjectReviewSpec implements Editable groups, io.fabric8.kubernetes.api.model.PodTemplateSpec template, String user) { + public PodSecurityPolicySubjectReviewSpec(List groups, PodTemplateSpec template, String user) { super(); this.groups = groups; this.template = template; @@ -93,12 +94,12 @@ public void setGroups(List groups) { } @JsonProperty("template") - public io.fabric8.kubernetes.api.model.PodTemplateSpec getTemplate() { + public PodTemplateSpec getTemplate() { return template; } @JsonProperty("template") - public void setTemplate(io.fabric8.kubernetes.api.model.PodTemplateSpec template) { + public void setTemplate(PodTemplateSpec template) { this.template = template; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/PodSecurityPolicySubjectReviewStatus.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/PodSecurityPolicySubjectReviewStatus.java index 13db10ecd84..4ac8f737dfa 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/PodSecurityPolicySubjectReviewStatus.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/PodSecurityPolicySubjectReviewStatus.java @@ -18,7 +18,9 @@ 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; @@ -43,10 +45,10 @@ @BuildableReference(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), - @BuildableReference(io.fabric8.kubernetes.api.model.PodTemplateSpec.class), + @BuildableReference(PodTemplateSpec.class), @BuildableReference(ResourceRequirements.class), @BuildableReference(IntOrString.class), - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class), + @BuildableReference(ObjectReference.class), @BuildableReference(LocalObjectReference.class), @BuildableReference(PersistentVolumeClaim.class) }) @@ -55,11 +57,11 @@ public class PodSecurityPolicySubjectReviewStatus implements Editable additionalProperties = new LinkedHashMap(); @@ -70,7 +72,7 @@ public class PodSecurityPolicySubjectReviewStatus implements Editable , KubernetesResource @@ -69,7 +65,8 @@ public class PolicyRule implements Editable , KubernetesResou @JsonInclude(JsonInclude.Include.NON_EMPTY) private List apiGroups = new ArrayList<>(); @JsonProperty("attributeRestrictions") - private KubernetesResource attributeRestrictions; + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + private Object attributeRestrictions; @JsonProperty("nonResourceURLs") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List nonResourceURLs = new ArrayList<>(); @@ -92,7 +89,7 @@ public class PolicyRule implements Editable , KubernetesResou public PolicyRule() { } - public PolicyRule(List apiGroups, KubernetesResource attributeRestrictions, List nonResourceURLs, List resourceNames, List resources, List verbs) { + public PolicyRule(List apiGroups, Object attributeRestrictions, List nonResourceURLs, List resourceNames, List resources, List verbs) { super(); this.apiGroups = apiGroups; this.attributeRestrictions = attributeRestrictions; @@ -114,12 +111,13 @@ public void setApiGroups(List apiGroups) { } @JsonProperty("attributeRestrictions") - public KubernetesResource getAttributeRestrictions() { + public Object getAttributeRestrictions() { return attributeRestrictions; } @JsonProperty("attributeRestrictions") - public void setAttributeRestrictions(KubernetesResource attributeRestrictions) { + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + public void setAttributeRestrictions(Object attributeRestrictions) { this.attributeRestrictions = attributeRestrictions; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Project.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Project.java index 5c70c8a268d..2f3953c4bc7 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Project.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Project.java @@ -17,6 +17,7 @@ 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.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -47,7 +48,7 @@ "" }) @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(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @@ -81,7 +82,7 @@ public class Project implements Editable , HasMetadata @JsonProperty("kind") private String kind = "Project"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("spec") private ProjectSpec spec; @JsonProperty("status") @@ -96,7 +97,7 @@ public class Project implements Editable , HasMetadata public Project() { } - public Project(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, ProjectSpec spec, ProjectStatus status) { + public Project(String apiVersion, String kind, ObjectMeta metadata, ProjectSpec spec, ProjectStatus status) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -146,12 +147,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ProjectRequest.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ProjectRequest.java index 53b3c8416c5..534680f20b3 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ProjectRequest.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ProjectRequest.java @@ -17,6 +17,7 @@ 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.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -47,7 +48,7 @@ "" }) @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(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @@ -85,7 +86,7 @@ public class ProjectRequest implements Editable , HasMeta @JsonProperty("kind") private String kind = "ProjectRequest"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -96,7 +97,7 @@ public class ProjectRequest implements Editable , HasMeta public ProjectRequest() { } - public ProjectRequest(String apiVersion, String description, String displayName, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public ProjectRequest(String apiVersion, String description, String displayName, String kind, ObjectMeta metadata) { super(); this.apiVersion = apiVersion; this.description = description; @@ -166,12 +167,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RangeAllocation.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RangeAllocation.java index 607ba7c7e24..8e369003de7 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RangeAllocation.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RangeAllocation.java @@ -17,6 +17,7 @@ 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.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -47,7 +48,7 @@ "" }) @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(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @@ -83,7 +84,7 @@ public class RangeAllocation implements Editable , HasMe @JsonProperty("kind") private String kind = "RangeAllocation"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("range") private String range; @JsonIgnore @@ -96,7 +97,7 @@ public class RangeAllocation implements Editable , HasMe public RangeAllocation() { } - public RangeAllocation(String apiVersion, String data, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, String range) { + public RangeAllocation(String apiVersion, String data, String kind, ObjectMeta metadata, String range) { super(); this.apiVersion = apiVersion; this.data = data; @@ -156,12 +157,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RepositoryImportSpec.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RepositoryImportSpec.java index 31458ff2286..85d8382cec3 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RepositoryImportSpec.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RepositoryImportSpec.java @@ -18,6 +18,7 @@ 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; @@ -48,7 +49,7 @@ @BuildableReference(PodTemplateSpec.class), @BuildableReference(ResourceRequirements.class), @BuildableReference(IntOrString.class), - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class), + @BuildableReference(ObjectReference.class), @BuildableReference(LocalObjectReference.class), @BuildableReference(PersistentVolumeClaim.class) }) @@ -57,7 +58,7 @@ public class RepositoryImportSpec implements Editable , KubernetesResource { - /** - * - * (Required) - * - */ @JsonProperty("apiVersion") - private String apiVersion = "authorization.openshift.io/v1"; + private String apiVersion; @JsonProperty("evalutionError") private String evalutionError; @JsonProperty("groups") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List groups = new ArrayList<>(); - /** - * - * (Required) - * - */ @JsonProperty("kind") - private String kind = "ResourceAccessReviewResponse"; + private String kind; @JsonProperty("namespace") private String namespace; @JsonProperty("users") @@ -114,21 +95,11 @@ public ResourceAccessReviewResponse(String apiVersion, String evalutionError, Li this.users = users; } - /** - * - * (Required) - * - */ @JsonProperty("apiVersion") public String getApiVersion() { return apiVersion; } - /** - * - * (Required) - * - */ @JsonProperty("apiVersion") public void setApiVersion(String apiVersion) { this.apiVersion = apiVersion; @@ -155,21 +126,11 @@ public void setGroups(List groups) { this.groups = groups; } - /** - * - * (Required) - * - */ @JsonProperty("kind") public String getKind() { return kind; } - /** - * - * (Required) - * - */ @JsonProperty("kind") public void setKind(String kind) { this.kind = kind; diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Role.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Role.java index 63efa94dbd1..844cc9ec1eb 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Role.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Role.java @@ -20,6 +20,7 @@ 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.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -49,7 +50,7 @@ "" }) @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(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @@ -83,7 +84,7 @@ public class Role implements Editable , HasMetadata, Namespaced @JsonProperty("kind") private String kind = "Role"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("rules") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List rules = new ArrayList<>(); @@ -97,7 +98,7 @@ public class Role implements Editable , HasMetadata, Namespaced public Role() { } - public Role(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, List rules) { + public Role(String apiVersion, String kind, ObjectMeta metadata, List rules) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -146,12 +147,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RoleBinding.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RoleBinding.java index 1c014a0fa1b..10a92704948 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RoleBinding.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RoleBinding.java @@ -20,6 +20,8 @@ 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.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; @@ -51,13 +53,13 @@ "" }) @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(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(ObjectReference.class), @BuildableReference(LocalObjectReference.class), @BuildableReference(PersistentVolumeClaim.class) }) @@ -88,12 +90,12 @@ public class RoleBinding implements Editable , HasMetadata, @JsonProperty("kind") private String kind = "RoleBinding"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("roleRef") - private io.fabric8.kubernetes.api.model.ObjectReference roleRef; + private ObjectReference roleRef; @JsonProperty("subjects") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List subjects = new ArrayList<>(); + private List subjects = new ArrayList<>(); @JsonProperty("userNames") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List userNames = new ArrayList<>(); @@ -107,7 +109,7 @@ public class RoleBinding implements Editable , HasMetadata, public RoleBinding() { } - public RoleBinding(String apiVersion, List groupNames, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, io.fabric8.kubernetes.api.model.ObjectReference roleRef, List subjects, List userNames) { + public RoleBinding(String apiVersion, List groupNames, String kind, ObjectMeta metadata, ObjectReference roleRef, List subjects, List userNames) { super(); this.apiVersion = apiVersion; this.groupNames = groupNames; @@ -170,33 +172,33 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } @JsonProperty("roleRef") - public io.fabric8.kubernetes.api.model.ObjectReference getRoleRef() { + public ObjectReference getRoleRef() { return roleRef; } @JsonProperty("roleRef") - public void setRoleRef(io.fabric8.kubernetes.api.model.ObjectReference roleRef) { + public void setRoleRef(ObjectReference roleRef) { this.roleRef = roleRef; } @JsonProperty("subjects") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getSubjects() { + public List getSubjects() { return subjects; } @JsonProperty("subjects") - public void setSubjects(List subjects) { + public void setSubjects(List subjects) { this.subjects = subjects; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RoleBindingRestriction.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RoleBindingRestriction.java index fe379047e09..496bf194198 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RoleBindingRestriction.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RoleBindingRestriction.java @@ -18,6 +18,7 @@ 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.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -47,7 +48,7 @@ "" }) @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(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @@ -81,7 +82,7 @@ public class RoleBindingRestriction implements Editable additionalProperties = new LinkedHashMap(); @@ -72,7 +75,7 @@ public class RoleBindingRestrictionSpec implements Editable , HasMetadata, Namespaced @JsonProperty("kind") private String kind = "Route"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("spec") private RouteSpec spec; @JsonProperty("status") @@ -97,7 +98,7 @@ public class Route implements Editable , HasMetadata, Namespaced public Route() { } - public Route(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, RouteSpec spec, RouteStatus status) { + public Route(String apiVersion, String kind, ObjectMeta metadata, RouteSpec spec, RouteStatus status) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -147,12 +148,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RouteHTTPHeader.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RouteHTTPHeader.java new file mode 100644 index 00000000000..754199c11fd --- /dev/null +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RouteHTTPHeader.java @@ -0,0 +1,122 @@ + +package io.fabric8.openshift.api.model; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "action", + "name" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class RouteHTTPHeader implements Editable , KubernetesResource +{ + + @JsonProperty("action") + private RouteHTTPHeaderActionUnion action; + @JsonProperty("name") + private String name; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public RouteHTTPHeader() { + } + + public RouteHTTPHeader(RouteHTTPHeaderActionUnion action, String name) { + super(); + this.action = action; + this.name = name; + } + + @JsonProperty("action") + public RouteHTTPHeaderActionUnion getAction() { + return action; + } + + @JsonProperty("action") + public void setAction(RouteHTTPHeaderActionUnion action) { + this.action = action; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonIgnore + public RouteHTTPHeaderBuilder edit() { + return new RouteHTTPHeaderBuilder(this); + } + + @JsonIgnore + public RouteHTTPHeaderBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/EgressNetworkPolicyRule.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RouteHTTPHeaderActionUnion.java similarity index 82% rename from kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/EgressNetworkPolicyRule.java rename to kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RouteHTTPHeaderActionUnion.java index 963b130e64c..b3437d3c7ef 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/EgressNetworkPolicyRule.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RouteHTTPHeaderActionUnion.java @@ -31,7 +31,7 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "to", + "set", "type" }) @ToString @@ -52,11 +52,11 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class EgressNetworkPolicyRule implements Editable , KubernetesResource +public class RouteHTTPHeaderActionUnion implements Editable , KubernetesResource { - @JsonProperty("to") - private EgressNetworkPolicyPeer to; + @JsonProperty("set") + private RouteSetHTTPHeader set; @JsonProperty("type") private String type; @JsonIgnore @@ -66,23 +66,23 @@ public class EgressNetworkPolicyRule implements Editable , KubernetesResource +public class RouteHTTPHeaderActions implements Editable , KubernetesResource { - @JsonProperty("groups") + @JsonProperty("request") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List groups = new ArrayList<>(); - @JsonProperty("labels") + private List request = new ArrayList<>(); + @JsonProperty("response") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List labels = new ArrayList<>(); + private List response = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -69,44 +70,44 @@ public class GroupRestriction implements Editable , Kub * No args constructor for use in serialization * */ - public GroupRestriction() { + public RouteHTTPHeaderActions() { } - public GroupRestriction(List groups, List labels) { + public RouteHTTPHeaderActions(List request, List response) { super(); - this.groups = groups; - this.labels = labels; + this.request = request; + this.response = response; } - @JsonProperty("groups") + @JsonProperty("request") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getGroups() { - return groups; + public List getRequest() { + return request; } - @JsonProperty("groups") - public void setGroups(List groups) { - this.groups = groups; + @JsonProperty("request") + public void setRequest(List request) { + this.request = request; } - @JsonProperty("labels") + @JsonProperty("response") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getLabels() { - return labels; + public List getResponse() { + return response; } - @JsonProperty("labels") - public void setLabels(List labels) { - this.labels = labels; + @JsonProperty("response") + public void setResponse(List response) { + this.response = response; } @JsonIgnore - public GroupRestrictionBuilder edit() { - return new GroupRestrictionBuilder(this); + public RouteHTTPHeaderActionsBuilder edit() { + return new RouteHTTPHeaderActionsBuilder(this); } @JsonIgnore - public GroupRestrictionBuilder toBuilder() { + public RouteHTTPHeaderActionsBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RouteHTTPHeaders.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RouteHTTPHeaders.java new file mode 100644 index 00000000000..f039ac34942 --- /dev/null +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RouteHTTPHeaders.java @@ -0,0 +1,108 @@ + +package io.fabric8.openshift.api.model; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "actions" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class RouteHTTPHeaders implements Editable , KubernetesResource +{ + + @JsonProperty("actions") + private RouteHTTPHeaderActions actions; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public RouteHTTPHeaders() { + } + + public RouteHTTPHeaders(RouteHTTPHeaderActions actions) { + super(); + this.actions = actions; + } + + @JsonProperty("actions") + public RouteHTTPHeaderActions getActions() { + return actions; + } + + @JsonProperty("actions") + public void setActions(RouteHTTPHeaderActions actions) { + this.actions = actions; + } + + @JsonIgnore + public RouteHTTPHeadersBuilder edit() { + return new RouteHTTPHeadersBuilder(this); + } + + @JsonIgnore + public RouteHTTPHeadersBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RoutePort.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RoutePort.java index 3f4909579ec..dbf22e71573 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RoutePort.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RoutePort.java @@ -13,6 +13,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.fabric8.kubernetes.api.builder.Editable; 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; @@ -44,7 +45,7 @@ @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @BuildableReference(ResourceRequirements.class), - @BuildableReference(io.fabric8.kubernetes.api.model.IntOrString.class), + @BuildableReference(IntOrString.class), @BuildableReference(ObjectReference.class), @BuildableReference(LocalObjectReference.class), @BuildableReference(PersistentVolumeClaim.class) @@ -54,7 +55,7 @@ public class RoutePort implements Editable , KubernetesResourc { @JsonProperty("targetPort") - private io.fabric8.kubernetes.api.model.IntOrString targetPort; + private IntOrString targetPort; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -65,18 +66,18 @@ public class RoutePort implements Editable , KubernetesResourc public RoutePort() { } - public RoutePort(io.fabric8.kubernetes.api.model.IntOrString targetPort) { + public RoutePort(IntOrString targetPort) { super(); this.targetPort = targetPort; } @JsonProperty("targetPort") - public io.fabric8.kubernetes.api.model.IntOrString getTargetPort() { + public IntOrString getTargetPort() { return targetPort; } @JsonProperty("targetPort") - public void setTargetPort(io.fabric8.kubernetes.api.model.IntOrString targetPort) { + public void setTargetPort(IntOrString targetPort) { this.targetPort = targetPort; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RouteSetHTTPHeader.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RouteSetHTTPHeader.java new file mode 100644 index 00000000000..987d360fed9 --- /dev/null +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RouteSetHTTPHeader.java @@ -0,0 +1,108 @@ + +package io.fabric8.openshift.api.model; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +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.builder.Editable; +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.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "value" +}) +@ToString +@EqualsAndHashCode +@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) +}) +@Generated("jsonschema2pojo") +public class RouteSetHTTPHeader implements Editable , KubernetesResource +{ + + @JsonProperty("value") + private String value; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public RouteSetHTTPHeader() { + } + + public RouteSetHTTPHeader(String value) { + super(); + this.value = value; + } + + @JsonProperty("value") + public String getValue() { + return value; + } + + @JsonProperty("value") + public void setValue(String value) { + this.value = value; + } + + @JsonIgnore + public RouteSetHTTPHeaderBuilder edit() { + return new RouteSetHTTPHeaderBuilder(this); + } + + @JsonIgnore + public RouteSetHTTPHeaderBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RouteSpec.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RouteSpec.java index 345764e579c..3c501011d74 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RouteSpec.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RouteSpec.java @@ -35,6 +35,7 @@ @JsonPropertyOrder({ "alternateBackends", "host", + "httpHeaders", "path", "port", "subdomain", @@ -68,6 +69,8 @@ public class RouteSpec implements Editable , KubernetesResourc private List alternateBackends = new ArrayList<>(); @JsonProperty("host") private String host; + @JsonProperty("httpHeaders") + private RouteHTTPHeaders httpHeaders; @JsonProperty("path") private String path; @JsonProperty("port") @@ -90,10 +93,11 @@ public class RouteSpec implements Editable , KubernetesResourc public RouteSpec() { } - public RouteSpec(List alternateBackends, String host, String path, RoutePort port, String subdomain, TLSConfig tls, RouteTargetReference to, String wildcardPolicy) { + public RouteSpec(List alternateBackends, String host, RouteHTTPHeaders httpHeaders, String path, RoutePort port, String subdomain, TLSConfig tls, RouteTargetReference to, String wildcardPolicy) { super(); this.alternateBackends = alternateBackends; this.host = host; + this.httpHeaders = httpHeaders; this.path = path; this.port = port; this.subdomain = subdomain; @@ -123,6 +127,16 @@ public void setHost(String host) { this.host = host; } + @JsonProperty("httpHeaders") + public RouteHTTPHeaders getHttpHeaders() { + return httpHeaders; + } + + @JsonProperty("httpHeaders") + public void setHttpHeaders(RouteHTTPHeaders httpHeaders) { + this.httpHeaders = httpHeaders; + } + @JsonProperty("path") public String getPath() { return path; diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SecretBuildSource.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SecretBuildSource.java index ab281fac9e8..11d1e8c3e6c 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SecretBuildSource.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SecretBuildSource.java @@ -16,6 +16,7 @@ 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; @@ -47,7 +48,7 @@ @BuildableReference(ResourceRequirements.class), @BuildableReference(IntOrString.class), @BuildableReference(ObjectReference.class), - @BuildableReference(io.fabric8.kubernetes.api.model.LocalObjectReference.class), + @BuildableReference(LocalObjectReference.class), @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") @@ -57,7 +58,7 @@ public class SecretBuildSource implements Editable , K @JsonProperty("destinationDir") private String destinationDir; @JsonProperty("secret") - private io.fabric8.kubernetes.api.model.LocalObjectReference secret; + private LocalObjectReference secret; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -68,7 +69,7 @@ public class SecretBuildSource implements Editable , K public SecretBuildSource() { } - public SecretBuildSource(String destinationDir, io.fabric8.kubernetes.api.model.LocalObjectReference secret) { + public SecretBuildSource(String destinationDir, LocalObjectReference secret) { super(); this.destinationDir = destinationDir; this.secret = secret; @@ -85,12 +86,12 @@ public void setDestinationDir(String destinationDir) { } @JsonProperty("secret") - public io.fabric8.kubernetes.api.model.LocalObjectReference getSecret() { + public LocalObjectReference getSecret() { return secret; } @JsonProperty("secret") - public void setSecret(io.fabric8.kubernetes.api.model.LocalObjectReference secret) { + public void setSecret(LocalObjectReference secret) { this.secret = secret; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SecretSpec.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SecretSpec.java index f6bccba3ac7..4c898b6fbe7 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SecretSpec.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SecretSpec.java @@ -16,6 +16,7 @@ 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; @@ -47,7 +48,7 @@ @BuildableReference(ResourceRequirements.class), @BuildableReference(IntOrString.class), @BuildableReference(ObjectReference.class), - @BuildableReference(io.fabric8.kubernetes.api.model.LocalObjectReference.class), + @BuildableReference(LocalObjectReference.class), @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") @@ -57,7 +58,7 @@ public class SecretSpec implements Editable , KubernetesResou @JsonProperty("mountPath") private String mountPath; @JsonProperty("secretSource") - private io.fabric8.kubernetes.api.model.LocalObjectReference secretSource; + private LocalObjectReference secretSource; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -68,7 +69,7 @@ public class SecretSpec implements Editable , KubernetesResou public SecretSpec() { } - public SecretSpec(String mountPath, io.fabric8.kubernetes.api.model.LocalObjectReference secretSource) { + public SecretSpec(String mountPath, LocalObjectReference secretSource) { super(); this.mountPath = mountPath; this.secretSource = secretSource; @@ -85,12 +86,12 @@ public void setMountPath(String mountPath) { } @JsonProperty("secretSource") - public io.fabric8.kubernetes.api.model.LocalObjectReference getSecretSource() { + public LocalObjectReference getSecretSource() { return secretSource; } @JsonProperty("secretSource") - public void setSecretSource(io.fabric8.kubernetes.api.model.LocalObjectReference secretSource) { + public void setSecretSource(LocalObjectReference secretSource) { this.secretSource = secretSource; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SecurityContextConstraints.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SecurityContextConstraints.java index c419edb57cd..8028370ca26 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SecurityContextConstraints.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SecurityContextConstraints.java @@ -19,6 +19,7 @@ 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.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -61,6 +62,7 @@ "seLinuxContext", "seccompProfiles", "supplementalGroups", + "userNamespaceLevel", "users", "volumes" }) @@ -71,7 +73,7 @@ "" }) @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(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @@ -141,7 +143,7 @@ public class SecurityContextConstraints implements Editable seccompProfiles = new ArrayList<>(); @JsonProperty("supplementalGroups") private SupplementalGroupsStrategyOptions supplementalGroups; + @JsonProperty("userNamespaceLevel") + private String userNamespaceLevel; @JsonProperty("users") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List users = new ArrayList<>(); @@ -174,7 +178,7 @@ public class SecurityContextConstraints implements Editable allowedCapabilities, List allowedFlexVolumes, List allowedUnsafeSysctls, String apiVersion, List defaultAddCapabilities, Boolean defaultAllowPrivilegeEscalation, List forbiddenSysctls, FSGroupStrategyOptions fsGroup, List groups, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, Integer priority, Boolean readOnlyRootFilesystem, List requiredDropCapabilities, RunAsUserStrategyOptions runAsUser, SELinuxContextStrategyOptions seLinuxContext, List seccompProfiles, SupplementalGroupsStrategyOptions supplementalGroups, List users, List volumes) { + public SecurityContextConstraints(Boolean allowHostDirVolumePlugin, Boolean allowHostIPC, Boolean allowHostNetwork, Boolean allowHostPID, Boolean allowHostPorts, Boolean allowPrivilegeEscalation, Boolean allowPrivilegedContainer, List allowedCapabilities, List allowedFlexVolumes, List allowedUnsafeSysctls, String apiVersion, List defaultAddCapabilities, Boolean defaultAllowPrivilegeEscalation, List forbiddenSysctls, FSGroupStrategyOptions fsGroup, List groups, String kind, ObjectMeta metadata, Integer priority, Boolean readOnlyRootFilesystem, List requiredDropCapabilities, RunAsUserStrategyOptions runAsUser, SELinuxContextStrategyOptions seLinuxContext, List seccompProfiles, SupplementalGroupsStrategyOptions supplementalGroups, String userNamespaceLevel, List users, List volumes) { super(); this.allowHostDirVolumePlugin = allowHostDirVolumePlugin; this.allowHostIPC = allowHostIPC; @@ -201,6 +205,7 @@ public SecurityContextConstraints(Boolean allowHostDirVolumePlugin, Boolean allo this.seLinuxContext = seLinuxContext; this.seccompProfiles = seccompProfiles; this.supplementalGroups = supplementalGroups; + this.userNamespaceLevel = userNamespaceLevel; this.users = users; this.volumes = volumes; } @@ -402,12 +407,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } @@ -483,6 +488,16 @@ public void setSupplementalGroups(SupplementalGroupsStrategyOptions supplemental this.supplementalGroups = supplementalGroups; } + @JsonProperty("userNamespaceLevel") + public String getUserNamespaceLevel() { + return userNamespaceLevel; + } + + @JsonProperty("userNamespaceLevel") + public void setUserNamespaceLevel(String userNamespaceLevel) { + this.userNamespaceLevel = userNamespaceLevel; + } + @JsonProperty("users") @JsonInclude(JsonInclude.Include.NON_EMPTY) public List getUsers() { diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SelfSubjectRulesReview.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SelfSubjectRulesReview.java index 85d4d46a5ba..99d79b61851 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SelfSubjectRulesReview.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SelfSubjectRulesReview.java @@ -17,7 +17,6 @@ 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.Namespaced; import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; @@ -64,7 +63,7 @@ @Version("v1") @Group("authorization.openshift.io") @Generated("jsonschema2pojo") -public class SelfSubjectRulesReview implements Editable , KubernetesResource, Namespaced +public class SelfSubjectRulesReview implements Editable , KubernetesResource { /** diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ServiceAccountPodSecurityPolicyReviewStatus.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ServiceAccountPodSecurityPolicyReviewStatus.java index e4c3d0d4793..c5b72bbfda5 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ServiceAccountPodSecurityPolicyReviewStatus.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ServiceAccountPodSecurityPolicyReviewStatus.java @@ -18,7 +18,9 @@ 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; @@ -44,10 +46,10 @@ @BuildableReference(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), - @BuildableReference(io.fabric8.kubernetes.api.model.PodTemplateSpec.class), + @BuildableReference(PodTemplateSpec.class), @BuildableReference(ResourceRequirements.class), @BuildableReference(IntOrString.class), - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class), + @BuildableReference(ObjectReference.class), @BuildableReference(LocalObjectReference.class), @BuildableReference(PersistentVolumeClaim.class) }) @@ -56,13 +58,13 @@ public class ServiceAccountPodSecurityPolicyReviewStatus implements Editable additionalProperties = new LinkedHashMap(); @@ -73,7 +75,7 @@ public class ServiceAccountPodSecurityPolicyReviewStatus implements Editable @JsonProperty("forcePull") private Boolean forcePull; @JsonProperty("from") - private io.fabric8.kubernetes.api.model.ObjectReference from; + private ObjectReference from; @JsonProperty("incremental") private Boolean incremental; @JsonProperty("pullSecret") - private io.fabric8.kubernetes.api.model.LocalObjectReference pullSecret; + private LocalObjectReference pullSecret; @JsonProperty("scripts") private String scripts; @JsonProperty("volumes") @@ -87,7 +89,7 @@ public class SourceBuildStrategy implements Editable public SourceBuildStrategy() { } - public SourceBuildStrategy(List env, Boolean forcePull, io.fabric8.kubernetes.api.model.ObjectReference from, Boolean incremental, io.fabric8.kubernetes.api.model.LocalObjectReference pullSecret, String scripts, List volumes) { + public SourceBuildStrategy(List env, Boolean forcePull, ObjectReference from, Boolean incremental, LocalObjectReference pullSecret, String scripts, List volumes) { super(); this.env = env; this.forcePull = forcePull; @@ -120,12 +122,12 @@ public void setForcePull(Boolean forcePull) { } @JsonProperty("from") - public io.fabric8.kubernetes.api.model.ObjectReference getFrom() { + public ObjectReference getFrom() { return from; } @JsonProperty("from") - public void setFrom(io.fabric8.kubernetes.api.model.ObjectReference from) { + public void setFrom(ObjectReference from) { this.from = from; } @@ -140,12 +142,12 @@ public void setIncremental(Boolean incremental) { } @JsonProperty("pullSecret") - public io.fabric8.kubernetes.api.model.LocalObjectReference getPullSecret() { + public LocalObjectReference getPullSecret() { return pullSecret; } @JsonProperty("pullSecret") - public void setPullSecret(io.fabric8.kubernetes.api.model.LocalObjectReference pullSecret) { + public void setPullSecret(LocalObjectReference pullSecret) { this.pullSecret = pullSecret; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SubjectAccessReview.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SubjectAccessReview.java index 8993cfb1b82..77a012e1042 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SubjectAccessReview.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SubjectAccessReview.java @@ -15,7 +15,6 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.fabric8.kubernetes.api.builder.Editable; import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.GenericKubernetesResource; import io.fabric8.kubernetes.api.model.IntOrString; import io.fabric8.kubernetes.api.model.KubernetesResource; import io.fabric8.kubernetes.api.model.LabelSelector; @@ -25,7 +24,6 @@ import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.fabric8.kubernetes.api.model.runtime.RawExtension; import io.fabric8.kubernetes.model.annotation.Group; import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; @@ -69,9 +67,7 @@ @BuildableReference(IntOrString.class), @BuildableReference(ObjectReference.class), @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class), - @BuildableReference(GenericKubernetesResource.class), - @BuildableReference(RawExtension.class) + @BuildableReference(PersistentVolumeClaim.class) }) @TemplateTransformations({ @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) @@ -90,7 +86,8 @@ public class SubjectAccessReview implements Editable @JsonProperty("apiVersion") private String apiVersion = "authorization.openshift.io/v1"; @JsonProperty("content") - private KubernetesResource content; + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + private Object content; @JsonProperty("groups") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List groups = new ArrayList<>(); @@ -132,7 +129,7 @@ public class SubjectAccessReview implements Editable public SubjectAccessReview() { } - public SubjectAccessReview(String apiVersion, KubernetesResource content, List groups, Boolean isNonResourceURL, String kind, String namespace, String path, String resource, String resourceAPIGroup, String resourceAPIVersion, String resourceName, List scopes, String user, String verb) { + public SubjectAccessReview(String apiVersion, Object content, List groups, Boolean isNonResourceURL, String kind, String namespace, String path, String resource, String resourceAPIGroup, String resourceAPIVersion, String resourceName, List scopes, String user, String verb) { super(); this.apiVersion = apiVersion; this.content = content; @@ -171,12 +168,13 @@ public void setApiVersion(String apiVersion) { } @JsonProperty("content") - public KubernetesResource getContent() { + public Object getContent() { return content; } @JsonProperty("content") - public void setContent(KubernetesResource content) { + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + public void setContent(Object content) { this.content = content; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SubjectAccessReviewResponse.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SubjectAccessReviewResponse.java index 414a5482783..57d4c6fdb47 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SubjectAccessReviewResponse.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SubjectAccessReviewResponse.java @@ -22,12 +22,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.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.ToString; import lombok.experimental.Accessors; @@ -59,33 +55,18 @@ @BuildableReference(LocalObjectReference.class), @BuildableReference(PersistentVolumeClaim.class) }) -@TemplateTransformations({ - @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) -}) -@Version("v1") -@Group("authorization.openshift.io") @Generated("jsonschema2pojo") public class SubjectAccessReviewResponse implements Editable , KubernetesResource { @JsonProperty("allowed") private Boolean allowed; - /** - * - * (Required) - * - */ @JsonProperty("apiVersion") - private String apiVersion = "authorization.openshift.io/v1"; + private String apiVersion; @JsonProperty("evaluationError") private String evaluationError; - /** - * - * (Required) - * - */ @JsonProperty("kind") - private String kind = "SubjectAccessReviewResponse"; + private String kind; @JsonProperty("namespace") private String namespace; @JsonProperty("reason") @@ -120,21 +101,11 @@ public void setAllowed(Boolean allowed) { this.allowed = allowed; } - /** - * - * (Required) - * - */ @JsonProperty("apiVersion") public String getApiVersion() { return apiVersion; } - /** - * - * (Required) - * - */ @JsonProperty("apiVersion") public void setApiVersion(String apiVersion) { this.apiVersion = apiVersion; @@ -150,21 +121,11 @@ public void setEvaluationError(String evaluationError) { this.evaluationError = evaluationError; } - /** - * - * (Required) - * - */ @JsonProperty("kind") public String getKind() { return kind; } - /** - * - * (Required) - * - */ @JsonProperty("kind") public void setKind(String kind) { this.kind = kind; diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SubjectRulesReview.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SubjectRulesReview.java index 2574b6b8a09..714f2208f55 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SubjectRulesReview.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SubjectRulesReview.java @@ -17,7 +17,6 @@ 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.Namespaced; import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; @@ -64,7 +63,7 @@ @Version("v1") @Group("authorization.openshift.io") @Generated("jsonschema2pojo") -public class SubjectRulesReview implements Editable , KubernetesResource, Namespaced +public class SubjectRulesReview implements Editable , KubernetesResource { /** diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/TLSConfig.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/TLSConfig.java index cae7ec81c55..2270b1fa16d 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/TLSConfig.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/TLSConfig.java @@ -34,6 +34,7 @@ "caCertificate", "certificate", "destinationCACertificate", + "externalCertificate", "insecureEdgeTerminationPolicy", "key", "termination" @@ -65,6 +66,8 @@ public class TLSConfig implements Editable , KubernetesResourc private String certificate; @JsonProperty("destinationCACertificate") private String destinationCACertificate; + @JsonProperty("externalCertificate") + private LocalObjectReference externalCertificate; @JsonProperty("insecureEdgeTerminationPolicy") private String insecureEdgeTerminationPolicy; @JsonProperty("key") @@ -81,11 +84,12 @@ public class TLSConfig implements Editable , KubernetesResourc public TLSConfig() { } - public TLSConfig(String caCertificate, String certificate, String destinationCACertificate, String insecureEdgeTerminationPolicy, String key, String termination) { + public TLSConfig(String caCertificate, String certificate, String destinationCACertificate, LocalObjectReference externalCertificate, String insecureEdgeTerminationPolicy, String key, String termination) { super(); this.caCertificate = caCertificate; this.certificate = certificate; this.destinationCACertificate = destinationCACertificate; + this.externalCertificate = externalCertificate; this.insecureEdgeTerminationPolicy = insecureEdgeTerminationPolicy; this.key = key; this.termination = termination; @@ -121,6 +125,16 @@ public void setDestinationCACertificate(String destinationCACertificate) { this.destinationCACertificate = destinationCACertificate; } + @JsonProperty("externalCertificate") + public LocalObjectReference getExternalCertificate() { + return externalCertificate; + } + + @JsonProperty("externalCertificate") + public void setExternalCertificate(LocalObjectReference externalCertificate) { + this.externalCertificate = externalCertificate; + } + @JsonProperty("insecureEdgeTerminationPolicy") public String getInsecureEdgeTerminationPolicy() { return insecureEdgeTerminationPolicy; diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/TagImageHook.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/TagImageHook.java index 260b8c11e99..e74af0e0241 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/TagImageHook.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/TagImageHook.java @@ -18,6 +18,7 @@ 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; @@ -46,7 +47,7 @@ @BuildableReference(PodTemplateSpec.class), @BuildableReference(ResourceRequirements.class), @BuildableReference(IntOrString.class), - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class), + @BuildableReference(ObjectReference.class), @BuildableReference(LocalObjectReference.class), @BuildableReference(PersistentVolumeClaim.class) }) @@ -57,7 +58,7 @@ public class TagImageHook implements Editable , KubernetesR @JsonProperty("containerName") private String containerName; @JsonProperty("to") - private io.fabric8.kubernetes.api.model.ObjectReference to; + private ObjectReference to; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -68,7 +69,7 @@ public class TagImageHook implements Editable , KubernetesR public TagImageHook() { } - public TagImageHook(String containerName, io.fabric8.kubernetes.api.model.ObjectReference to) { + public TagImageHook(String containerName, ObjectReference to) { super(); this.containerName = containerName; this.to = to; @@ -85,12 +86,12 @@ public void setContainerName(String containerName) { } @JsonProperty("to") - public io.fabric8.kubernetes.api.model.ObjectReference getTo() { + public ObjectReference getTo() { return to; } @JsonProperty("to") - public void setTo(io.fabric8.kubernetes.api.model.ObjectReference to) { + public void setTo(ObjectReference to) { this.to = to; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/TagReference.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/TagReference.java index 92dbaa7f87b..dbbb80e243f 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/TagReference.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/TagReference.java @@ -18,6 +18,7 @@ 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; @@ -51,7 +52,7 @@ @BuildableReference(PodTemplateSpec.class), @BuildableReference(ResourceRequirements.class), @BuildableReference(IntOrString.class), - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class), + @BuildableReference(ObjectReference.class), @BuildableReference(LocalObjectReference.class), @BuildableReference(PersistentVolumeClaim.class) }) @@ -63,7 +64,7 @@ public class TagReference implements Editable , KubernetesR @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map annotations = new LinkedHashMap<>(); @JsonProperty("from") - private io.fabric8.kubernetes.api.model.ObjectReference from; + private ObjectReference from; @JsonProperty("generation") private Long generation; @JsonProperty("importPolicy") @@ -84,7 +85,7 @@ public class TagReference implements Editable , KubernetesR public TagReference() { } - public TagReference(Map annotations, io.fabric8.kubernetes.api.model.ObjectReference from, Long generation, TagImportPolicy importPolicy, String name, Boolean reference, TagReferencePolicy referencePolicy) { + public TagReference(Map annotations, ObjectReference from, Long generation, TagImportPolicy importPolicy, String name, Boolean reference, TagReferencePolicy referencePolicy) { super(); this.annotations = annotations; this.from = from; @@ -107,12 +108,12 @@ public void setAnnotations(Map annotations) { } @JsonProperty("from") - public io.fabric8.kubernetes.api.model.ObjectReference getFrom() { + public ObjectReference getFrom() { return from; } @JsonProperty("from") - public void setFrom(io.fabric8.kubernetes.api.model.ObjectReference from) { + public void setFrom(ObjectReference from) { this.from = from; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Template.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Template.java index 98fbe8321c2..81ecc4c7473 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Template.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Template.java @@ -15,17 +15,16 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.fabric8.kubernetes.api.builder.Editable; import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.GenericKubernetesResource; 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.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.runtime.RawExtension; import io.fabric8.kubernetes.model.annotation.Group; import io.fabric8.kubernetes.model.annotation.Version; import io.sundr.builder.annotations.Buildable; @@ -54,7 +53,7 @@ "" }) @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(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @@ -62,9 +61,7 @@ @BuildableReference(IntOrString.class), @BuildableReference(ObjectReference.class), @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class), - @BuildableReference(GenericKubernetesResource.class), - @BuildableReference(RawExtension.class) + @BuildableReference(PersistentVolumeClaim.class) }) @TemplateTransformations({ @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) @@ -95,10 +92,11 @@ public class Template implements Editable , HasMetadata, Namesp @JsonProperty("message") private String message; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("objects") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializerForList.class) @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List objects = new ArrayList<>(); + private List objects = new ArrayList<>(); @JsonProperty("parameters") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List parameters = new ArrayList<>(); @@ -112,7 +110,7 @@ public class Template implements Editable , HasMetadata, Namesp public Template() { } - public Template(String apiVersion, String kind, Map labels, String message, io.fabric8.kubernetes.api.model.ObjectMeta metadata, List objects, List parameters) { + public Template(String apiVersion, String kind, Map labels, String message, ObjectMeta metadata, List objects, List parameters) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -185,23 +183,24 @@ public void setMessage(String message) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } @JsonProperty("objects") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getObjects() { + public List getObjects() { return objects; } @JsonProperty("objects") - public void setObjects(List objects) { + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializerForList.class) + public void setObjects(List objects) { this.objects = objects; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/TemplateInstance.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/TemplateInstance.java index 55cd800f10d..49471065d04 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/TemplateInstance.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/TemplateInstance.java @@ -18,6 +18,7 @@ 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.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -48,7 +49,7 @@ "" }) @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(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @@ -82,7 +83,7 @@ public class TemplateInstance implements Editable , Has @JsonProperty("kind") private String kind = "TemplateInstance"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("spec") private TemplateInstanceSpec spec; @JsonProperty("status") @@ -97,7 +98,7 @@ public class TemplateInstance implements Editable , Has public TemplateInstance() { } - public TemplateInstance(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, TemplateInstanceSpec spec, TemplateInstanceStatus status) { + public TemplateInstance(String apiVersion, String kind, ObjectMeta metadata, TemplateInstanceSpec spec, TemplateInstanceStatus status) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -147,12 +148,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/TemplateInstanceObject.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/TemplateInstanceObject.java index 77d45b3bdfd..1a571c029e8 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/TemplateInstanceObject.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/TemplateInstanceObject.java @@ -18,6 +18,7 @@ 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; @@ -45,7 +46,7 @@ @BuildableReference(PodTemplateSpec.class), @BuildableReference(ResourceRequirements.class), @BuildableReference(IntOrString.class), - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class), + @BuildableReference(ObjectReference.class), @BuildableReference(LocalObjectReference.class), @BuildableReference(PersistentVolumeClaim.class) }) @@ -54,7 +55,7 @@ public class TemplateInstanceObject implements Editable additionalProperties = new LinkedHashMap(); @@ -65,18 +66,18 @@ public class TemplateInstanceObject implements Editable , HasMetadata @JsonProperty("kind") private String kind = "User"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -103,7 +104,7 @@ public class User implements Editable , HasMetadata public User() { } - public User(String apiVersion, String fullName, List groups, List identities, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public User(String apiVersion, String fullName, List groups, List identities, String kind, ObjectMeta metadata) { super(); this.apiVersion = apiVersion; this.fullName = fullName; @@ -186,12 +187,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/UserIdentityMapping.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/UserIdentityMapping.java index f2623fe3854..a6a78eaee32 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/UserIdentityMapping.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/UserIdentityMapping.java @@ -17,6 +17,8 @@ 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.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; @@ -46,13 +48,13 @@ "" }) @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(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(ObjectReference.class), @BuildableReference(LocalObjectReference.class), @BuildableReference(PersistentVolumeClaim.class) }) @@ -73,7 +75,7 @@ public class UserIdentityMapping implements Editable @JsonProperty("apiVersion") private String apiVersion = "user.openshift.io/v1"; @JsonProperty("identity") - private io.fabric8.kubernetes.api.model.ObjectReference identity; + private ObjectReference identity; /** * * (Required) @@ -82,9 +84,9 @@ public class UserIdentityMapping implements Editable @JsonProperty("kind") private String kind = "UserIdentityMapping"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("user") - private io.fabric8.kubernetes.api.model.ObjectReference user; + private ObjectReference user; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -95,7 +97,7 @@ public class UserIdentityMapping implements Editable public UserIdentityMapping() { } - public UserIdentityMapping(String apiVersion, io.fabric8.kubernetes.api.model.ObjectReference identity, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, io.fabric8.kubernetes.api.model.ObjectReference user) { + public UserIdentityMapping(String apiVersion, ObjectReference identity, String kind, ObjectMeta metadata, ObjectReference user) { super(); this.apiVersion = apiVersion; this.identity = identity; @@ -125,12 +127,12 @@ public void setApiVersion(String apiVersion) { } @JsonProperty("identity") - public io.fabric8.kubernetes.api.model.ObjectReference getIdentity() { + public ObjectReference getIdentity() { return identity; } @JsonProperty("identity") - public void setIdentity(io.fabric8.kubernetes.api.model.ObjectReference identity) { + public void setIdentity(ObjectReference identity) { this.identity = identity; } @@ -155,22 +157,22 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } @JsonProperty("user") - public io.fabric8.kubernetes.api.model.ObjectReference getUser() { + public ObjectReference getUser() { return user; } @JsonProperty("user") - public void setUser(io.fabric8.kubernetes.api.model.ObjectReference user) { + public void setUser(ObjectReference user) { this.user = user; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/UserOAuthAccessToken.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/UserOAuthAccessToken.java index 3cdf357fdc1..1b223ca60c4 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/UserOAuthAccessToken.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/UserOAuthAccessToken.java @@ -19,6 +19,7 @@ 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.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -56,7 +57,7 @@ "" }) @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(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @@ -98,7 +99,7 @@ public class UserOAuthAccessToken implements Editable scopes, String userName, String userUID) { + public UserOAuthAccessToken(String apiVersion, String authorizeToken, String clientName, Long expiresIn, Integer inactivityTimeoutSeconds, String kind, ObjectMeta metadata, String redirectURI, String refreshToken, List scopes, String userName, String userUID) { super(); this.apiVersion = apiVersion; this.authorizeToken = authorizeToken; @@ -217,12 +218,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/openshift-model/src/test/java/io/fabric8/kubernetes/api/model/TemplateTest.java b/kubernetes-model-generator/openshift-model/src/test/java/io/fabric8/kubernetes/api/model/TemplateTest.java index f566e3d66a9..95b18f20e56 100644 --- a/kubernetes-model-generator/openshift-model/src/test/java/io/fabric8/kubernetes/api/model/TemplateTest.java +++ b/kubernetes-model-generator/openshift-model/src/test/java/io/fabric8/kubernetes/api/model/TemplateTest.java @@ -38,7 +38,7 @@ void getObjectsWithObjectsShouldReturnList() { .addToObjects(new ProjectBuilder().build()) .build(); // When - final List result = template.getObjects(); + final List result = template.getObjects(); // Then assertThat(result) .extracting("class") diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/APIRequestCountTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/APIRequestCountTest.java index 35fbf9b2ed2..b8696029e1d 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/APIRequestCountTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/APIRequestCountTest.java @@ -19,7 +19,7 @@ import io.fabric8.openshift.api.model.miscellaneous.apiserver.v1.APIRequestCountBuilder; import io.fabric8.openshift.api.model.miscellaneous.apiserver.v1.APIRequestCountList; import io.fabric8.openshift.api.model.miscellaneous.apiserver.v1.APIRequestCountListBuilder; -import io.fabric8.openshift.api.model.miscellaneous.apiserver.v1.PerResourceAPIRequestLogBuilder; +import io.fabric8.openshift.api.model.miscellaneous.apiserver.v1.APIRequestCountStatusLast24hBuilder; import io.fabric8.openshift.client.OpenShiftClient; import org.junit.jupiter.api.Test; @@ -88,7 +88,7 @@ private APIRequestCount createNewAPIRequestCount(String name) { .withNumberOfUsersToReport(10L) .endSpec() .withNewStatus() - .withLast24h(new PerResourceAPIRequestLogBuilder() + .withLast24h(new APIRequestCountStatusLast24hBuilder() .addNewByNode() .withNodeName("192.168.126.10") .withRequestCount(0L) diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/BareMetalHostTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/BareMetalHostTest.java index 10a90afdd7e..1ceb908e085 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/BareMetalHostTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/BareMetalHostTest.java @@ -99,13 +99,6 @@ private BareMetalHost createNewBareMetalHost(String name) { .withNewUserData("bmo-master-user-data", "bmo-project") .withNewNetworkData("bmo-master-network-data", "bmo-project") .withNewMetaData("bmo-master-meta-data", "bmo-project") - .withNewRaid() - .addNewHardwareRAIDVolume() - .withLevel("1") - .withSizeGibibytes(200) - .withRotational(true) - .endHardwareRAIDVolume() - .endRaid() .withBootMACAddress("98:03:9b:61:80:48") .withExternallyProvisioned(true) .withHardwareProfile("default") diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/CredentialsRequestTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/CredentialsRequestTest.java index d7014b311fc..c2e881768e5 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/CredentialsRequestTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/CredentialsRequestTest.java @@ -15,6 +15,7 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.api.model.GenericKubernetesResourceBuilder; import io.fabric8.openshift.api.model.miscellaneous.cloudcredential.v1.CredentialsRequest; import io.fabric8.openshift.api.model.miscellaneous.cloudcredential.v1.CredentialsRequestBuilder; import io.fabric8.openshift.api.model.miscellaneous.cloudcredential.v1.CredentialsRequestList; @@ -84,9 +85,11 @@ private CredentialsRequest createNewCredentialsRequest(String name) { return new CredentialsRequestBuilder() .withNewMetadata().withName(name).endMetadata() .withNewSpec() - .addToProviderSpec("apiVersion", "cloudcredential.openshift.io/v1") - .addToProviderSpec("kind", "GCPProviderSpec") - .addToProviderSpec("skipServiceCheck", "true") + .withProviderSpec(new GenericKubernetesResourceBuilder() + .withApiVersion("cloudcredential.openshift.io/v1") + .withKind("GCPProviderSpec") + .addToAdditionalProperties("skipServiceCheck", "true") + .build()) .withNewSecretRef() .withName("cloud-credential-operator-gcp-ro-creds") .withNamespace("openshift-cloud-credential-operator") diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/EgressNetworkPolicyTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/EgressNetworkPolicyTest.java deleted file mode 100644 index d92c460426c..00000000000 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/EgressNetworkPolicyTest.java +++ /dev/null @@ -1,124 +0,0 @@ -/* - * 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.openshift.client.server.mock; - -import io.fabric8.openshift.api.model.EgressNetworkPolicy; -import io.fabric8.openshift.api.model.EgressNetworkPolicyBuilder; -import io.fabric8.openshift.api.model.EgressNetworkPolicyList; -import io.fabric8.openshift.api.model.EgressNetworkPolicyListBuilder; -import io.fabric8.openshift.client.OpenShiftClient; -import org.junit.jupiter.api.Test; - -import java.net.HttpURLConnection; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; - -@EnableOpenShiftMockClient -class EgressNetworkPolicyTest { - - OpenShiftMockServer server; - OpenShiftClient client; - - @Test - void create() { - // Given - EgressNetworkPolicy egressNetworkPolicy = getEgressNetworkPolicy(); - server.expect().post() - .withPath("/apis/network.openshift.io/v1/namespaces/ns1/egressnetworkpolicies") - .andReturn(HttpURLConnection.HTTP_OK, egressNetworkPolicy) - .once(); - - // When - egressNetworkPolicy = client.egressNetworkPolicies().inNamespace("ns1").create(egressNetworkPolicy); - - // Then - assertNotNull(egressNetworkPolicy); - assertEquals("foo", egressNetworkPolicy.getMetadata().getName()); - } - - @Test - void get() { - // Given - server.expect().get() - .withPath("/apis/network.openshift.io/v1/namespaces/ns1/egressnetworkpolicies/foo") - .andReturn(HttpURLConnection.HTTP_OK, getEgressNetworkPolicy()) - .once(); - - // When - EgressNetworkPolicy f = client.egressNetworkPolicies().inNamespace("ns1").withName("foo").get(); - - // Then - assertNotNull(f); - assertEquals("foo", f.getMetadata().getName()); - } - - @Test - void list() { - // Given - server.expect().get() - .withPath("/apis/network.openshift.io/v1/namespaces/ns1/egressnetworkpolicies") - .andReturn(HttpURLConnection.HTTP_OK, new EgressNetworkPolicyListBuilder().withItems(getEgressNetworkPolicy()).build()) - .once(); - - // When - EgressNetworkPolicyList fgList = client.egressNetworkPolicies().inNamespace("ns1").list(); - - // Then - assertNotNull(fgList); - assertNotNull(fgList.getItems()); - assertEquals(1, fgList.getItems().size()); - } - - @Test - void delete() { - // Given - server.expect().delete() - .withPath("/apis/network.openshift.io/v1/namespaces/ns1/egressnetworkpolicies/foo") - .andReturn(HttpURLConnection.HTTP_OK, getEgressNetworkPolicy()) - .once(); - - // When - boolean deleted = client.egressNetworkPolicies().inNamespace("ns1").withName("foo").delete().size() == 1; - - // Then - assertTrue(deleted); - } - - private EgressNetworkPolicy getEgressNetworkPolicy() { - return new EgressNetworkPolicyBuilder() - .withNewMetadata() - .withName("foo") - .withNamespace("ns1") - .endMetadata() - .withNewSpec() - .addNewEgress() - .withType("Allow") - .withNewTo() - .withCidrSelector("1.2.3.0/24") - .endTo() - .endEgress() - .addNewEgress() - .withType("Allow") - .withNewTo() - .withDnsName("www.foo.com") - .endTo() - .endEgress() - .endSpec() - .build(); - } -} diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/EgressRouterTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/EgressRouterTest.java index 0756839c0c5..4996c23d9fa 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/EgressRouterTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/EgressRouterTest.java @@ -15,10 +15,10 @@ */ package io.fabric8.openshift.client.server.mock; -import io.fabric8.openshift.api.model.miscellaneous.network.operator.v1.EgressRouter; -import io.fabric8.openshift.api.model.miscellaneous.network.operator.v1.EgressRouterBuilder; -import io.fabric8.openshift.api.model.miscellaneous.network.operator.v1.EgressRouterList; -import io.fabric8.openshift.api.model.miscellaneous.network.operator.v1.EgressRouterListBuilder; +import io.fabric8.openshift.api.model.operator.network.v1.EgressRouter; +import io.fabric8.openshift.api.model.operator.network.v1.EgressRouterBuilder; +import io.fabric8.openshift.api.model.operator.network.v1.EgressRouterList; +import io.fabric8.openshift.api.model.operator.network.v1.EgressRouterListBuilder; import io.fabric8.openshift.client.OpenShiftClient; import org.junit.jupiter.api.Test; diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/HelmChartRepositoryTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/HelmChartRepositoryTest.java index 3a80bb91566..62c8bbdda99 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/HelmChartRepositoryTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/HelmChartRepositoryTest.java @@ -15,10 +15,10 @@ */ package io.fabric8.openshift.client.server.mock; -import io.fabric8.openshift.api.model.HelmChartRepository; -import io.fabric8.openshift.api.model.HelmChartRepositoryBuilder; -import io.fabric8.openshift.api.model.HelmChartRepositoryList; -import io.fabric8.openshift.api.model.HelmChartRepositoryListBuilder; +import io.fabric8.openshift.api.model.miscellaneous.helm.v1beta1.HelmChartRepository; +import io.fabric8.openshift.api.model.miscellaneous.helm.v1beta1.HelmChartRepositoryBuilder; +import io.fabric8.openshift.api.model.miscellaneous.helm.v1beta1.HelmChartRepositoryList; +import io.fabric8.openshift.api.model.miscellaneous.helm.v1beta1.HelmChartRepositoryListBuilder; import io.fabric8.openshift.client.OpenShiftClient; import org.junit.jupiter.api.Test; diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/HostSubnetTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/HostSubnetTest.java deleted file mode 100644 index 72c9ac08fbd..00000000000 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/HostSubnetTest.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * 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.openshift.client.server.mock; - -import io.fabric8.openshift.api.model.HostSubnet; -import io.fabric8.openshift.api.model.HostSubnetBuilder; -import io.fabric8.openshift.api.model.HostSubnetList; -import io.fabric8.openshift.api.model.HostSubnetListBuilder; -import io.fabric8.openshift.client.OpenShiftClient; -import org.junit.jupiter.api.Test; - -import java.net.HttpURLConnection; - -import static org.assertj.core.api.Assertions.assertThat; - -@EnableOpenShiftMockClient -class HostSubnetTest { - private OpenShiftClient client; - private OpenShiftMockServer server; - - @Test - void get() { - // Given - server.expect().get().withPath("/apis/network.openshift.io/v1/hostsubnets/test-get") - .andReturn(HttpURLConnection.HTTP_OK, createNewHostSubnet("test-get")) - .once(); - - // When - HostSubnet hostSubnet = client.hostSubnets().withName("test-get").get(); - - // Then - assertThat(hostSubnet) - .isNotNull() - .hasFieldOrPropertyWithValue("metadata.name", "test-get"); - } - - @Test - void list() { - // Given - server.expect().get().withPath("/apis/network.openshift.io/v1/hostsubnets") - .andReturn(HttpURLConnection.HTTP_OK, new HostSubnetListBuilder() - .addToItems(createNewHostSubnet("test-list")) - .build()) - .once(); - - // When - HostSubnetList hostSubnetList = client.hostSubnets().list(); - - // Then - assertThat(hostSubnetList).isNotNull(); - assertThat(hostSubnetList.getItems()).hasSize(1); - assertThat(hostSubnetList.getItems().get(0)) - .hasFieldOrPropertyWithValue("metadata.name", "test-list"); - } - - @Test - void delete() { - // Given - server.expect().delete().withPath("/apis/network.openshift.io/v1/hostsubnets/test-delete") - .andReturn(HttpURLConnection.HTTP_OK, createNewHostSubnet("test-delete")) - .once(); - - // When - boolean isDeleted = client.hostSubnets().withName("test-delete").delete().size() == 1; - - // Then - assertThat(isDeleted).isTrue(); - } - - private HostSubnet createNewHostSubnet(String name) { - return new HostSubnetBuilder() - .withNewMetadata().withName(name).endMetadata() - .withHost("crc-rsppg-master-0") - .withHostIP("192.168.126.11") - .withKind("HostSubnet") - .withSubnet("10.217.0.0/23") - .build(); - } -} diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ImageRegistryOperatorConfigTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ImageRegistryOperatorConfigTest.java index 930a0acacf3..3b8f6ef0fe0 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ImageRegistryOperatorConfigTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ImageRegistryOperatorConfigTest.java @@ -15,11 +15,10 @@ */ package io.fabric8.openshift.client.server.mock; -import io.fabric8.kubernetes.api.model.Duration; -import io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1.Config; -import io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1.ConfigBuilder; -import io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1.ConfigList; -import io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1.ConfigListBuilder; +import io.fabric8.openshift.api.model.operator.imageregistry.v1.Config; +import io.fabric8.openshift.api.model.operator.imageregistry.v1.ConfigBuilder; +import io.fabric8.openshift.api.model.operator.imageregistry.v1.ConfigList; +import io.fabric8.openshift.api.model.operator.imageregistry.v1.ConfigListBuilder; import io.fabric8.openshift.client.OpenShiftClient; import org.junit.jupiter.api.Test; @@ -94,10 +93,10 @@ private Config createNewConfig(String name) throws ParseException { .withReplicas(1) .withNewRequests() .withNewRead() - .withMaxWaitInQueue(Duration.parse("0s")) + .withMaxWaitInQueue("0s") .endRead() .withNewWrite() - .withMaxWaitInQueue(Duration.parse("0s")) + .withMaxWaitInQueue("0s") .endWrite() .endRequests() .withRolloutStrategy("RollingUpdate") diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/Metal3RemediationTemplateTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/Metal3RemediationTemplateTest.java index 6fe03be4e5c..538ca80f95d 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/Metal3RemediationTemplateTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/Metal3RemediationTemplateTest.java @@ -15,7 +15,6 @@ */ package io.fabric8.openshift.client.server.mock; -import io.fabric8.kubernetes.api.model.Duration; import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.miscellaneous.metal3.v1beta1.Metal3RemediationTemplate; @@ -117,7 +116,7 @@ private Metal3RemediationTemplate getMetal3RemediationTemplate() throws ParseExc .withNewTemplate() .withNewSpec() .withNewStrategy() - .withTimeout(Duration.parse("5s")) + .withTimeout("5s") .withRetryLimit(5) .withType("Done") .endStrategy() diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/Metal3RemediationTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/Metal3RemediationTest.java index cb48a5d9d4f..e91315c19c1 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/Metal3RemediationTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/Metal3RemediationTest.java @@ -15,7 +15,6 @@ */ package io.fabric8.openshift.client.server.mock; -import io.fabric8.kubernetes.api.model.Duration; import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.miscellaneous.metal3.v1beta1.Metal3Remediation; @@ -110,7 +109,7 @@ private Metal3Remediation getMetal3Remediation() throws ParseException { .endMetadata() .withNewSpec() .withNewStrategy() - .withTimeout(Duration.parse("5s")) + .withTimeout("5s") .withRetryLimit(5) .withType("Done") .endStrategy() diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OpenShiftLoadTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OpenShiftLoadTest.java index e969e5ab825..856f74b0f57 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OpenShiftLoadTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OpenShiftLoadTest.java @@ -55,7 +55,7 @@ void testResourceGetFromLoadWhenSingleDocumentsWithStartingDelimiter() { void testResourceGetFromLoadWhenSingleDocumentsWithoutDelimiter() { // when - List result = client.templates() + List result = client.templates() .load(getClass().getResourceAsStream("/template-with-params.yml")) .item() .getObjects(); @@ -63,7 +63,7 @@ void testResourceGetFromLoadWhenSingleDocumentsWithoutDelimiter() { // then assertNotNull(result); assertEquals(1, result.size()); - HasMetadata deploymentResource = result.get(0); + HasMetadata deploymentResource = (HasMetadata) result.get(0); assertEquals("v1", deploymentResource.getApiVersion()); assertEquals("Pod", deploymentResource.getKind()); assertEquals("example-pod", deploymentResource.getMetadata().getName()); diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OpenShiftResourcesTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OpenShiftResourcesTest.java index c3bb163af82..dc3eb499d2c 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OpenShiftResourcesTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OpenShiftResourcesTest.java @@ -22,15 +22,11 @@ import io.fabric8.openshift.api.model.AppliedClusterResourceQuota; import io.fabric8.openshift.api.model.BrokerTemplateInstance; import io.fabric8.openshift.api.model.BuildConfig; -import io.fabric8.openshift.api.model.ClusterNetwork; import io.fabric8.openshift.api.model.ClusterResourceQuota; import io.fabric8.openshift.api.model.ClusterRole; import io.fabric8.openshift.api.model.ClusterRoleBinding; import io.fabric8.openshift.api.model.DeploymentConfig; -import io.fabric8.openshift.api.model.EgressNetworkPolicy; import io.fabric8.openshift.api.model.Group; -import io.fabric8.openshift.api.model.HelmChartRepository; -import io.fabric8.openshift.api.model.HostSubnet; import io.fabric8.openshift.api.model.Identity; import io.fabric8.openshift.api.model.ImageSignature; import io.fabric8.openshift.api.model.ImageStream; @@ -38,7 +34,6 @@ import io.fabric8.openshift.api.model.ImageStreamMapping; import io.fabric8.openshift.api.model.ImageStreamTag; import io.fabric8.openshift.api.model.ImageTag; -import io.fabric8.openshift.api.model.NetNamespace; import io.fabric8.openshift.api.model.OAuthAccessToken; import io.fabric8.openshift.api.model.OAuthAuthorizeToken; import io.fabric8.openshift.api.model.OAuthClient; @@ -87,8 +82,9 @@ import io.fabric8.openshift.api.model.machineconfig.v1.MachineConfigPool; import io.fabric8.openshift.api.model.miscellaneous.apiserver.v1.APIRequestCount; import io.fabric8.openshift.api.model.miscellaneous.cloudcredential.v1.CredentialsRequest; -import io.fabric8.openshift.api.model.miscellaneous.network.operator.v1.EgressRouter; -import io.fabric8.openshift.api.model.miscellaneous.network.operator.v1.OperatorPKI; +import io.fabric8.openshift.api.model.miscellaneous.helm.v1beta1.HelmChartRepository; +import io.fabric8.openshift.api.model.operator.network.v1.EgressRouter; +import io.fabric8.openshift.api.model.operator.network.v1.OperatorPKI; import io.fabric8.openshift.api.model.operator.v1.CSISnapshotController; import io.fabric8.openshift.api.model.operator.v1.CloudCredential; import io.fabric8.openshift.api.model.operator.v1.ClusterCSIDriver; @@ -172,10 +168,6 @@ private static Stream argumentProvider() { Arguments.of(KubeletConfig.class, false, "machineconfiguration.openshift.io", "v1", "kubeletconfigs"), Arguments.of(MachineConfigPool.class, false, "machineconfiguration.openshift.io", "v1", "machineconfigpools"), Arguments.of(MachineConfig.class, false, "machineconfiguration.openshift.io", "v1", "machineconfigs"), - Arguments.of(ClusterNetwork.class, false, "network.openshift.io", "v1", "clusternetworks"), - Arguments.of(EgressNetworkPolicy.class, true, "network.openshift.io", "v1", "egressnetworkpolicies"), - Arguments.of(HostSubnet.class, false, "network.openshift.io", "v1", "hostsubnets"), - Arguments.of(NetNamespace.class, false, "network.openshift.io", "v1", "netnamespaces"), Arguments.of(EgressRouter.class, true, "network.operator.openshift.io", "v1", "egressrouters"), Arguments.of(OperatorPKI.class, true, "network.operator.openshift.io", "v1", "operatorpkis"), Arguments.of(OAuthAccessToken.class, false, "oauth.openshift.io", "v1", "oauthaccesstokens"), diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OperatorPKITest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OperatorPKITest.java index 734d441925b..963144a0acc 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OperatorPKITest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OperatorPKITest.java @@ -15,10 +15,10 @@ */ package io.fabric8.openshift.client.server.mock; -import io.fabric8.openshift.api.model.miscellaneous.network.operator.v1.OperatorPKI; -import io.fabric8.openshift.api.model.miscellaneous.network.operator.v1.OperatorPKIBuilder; -import io.fabric8.openshift.api.model.miscellaneous.network.operator.v1.OperatorPKIList; -import io.fabric8.openshift.api.model.miscellaneous.network.operator.v1.OperatorPKIListBuilder; +import io.fabric8.openshift.api.model.operator.network.v1.OperatorPKI; +import io.fabric8.openshift.api.model.operator.network.v1.OperatorPKIBuilder; +import io.fabric8.openshift.api.model.operator.network.v1.OperatorPKIList; +import io.fabric8.openshift.api.model.operator.network.v1.OperatorPKIListBuilder; import io.fabric8.openshift.client.OpenShiftClient; import org.junit.jupiter.api.Test; diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ProjectHelmChartRepositoryTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ProjectHelmChartRepositoryTest.java index d3713fc1f17..2e9a6ae931e 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ProjectHelmChartRepositoryTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ProjectHelmChartRepositoryTest.java @@ -17,10 +17,10 @@ import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; -import io.fabric8.openshift.api.model.ProjectHelmChartRepository; -import io.fabric8.openshift.api.model.ProjectHelmChartRepositoryBuilder; -import io.fabric8.openshift.api.model.ProjectHelmChartRepositoryList; -import io.fabric8.openshift.api.model.ProjectHelmChartRepositoryListBuilder; +import io.fabric8.openshift.api.model.miscellaneous.helm.v1beta1.ProjectHelmChartRepository; +import io.fabric8.openshift.api.model.miscellaneous.helm.v1beta1.ProjectHelmChartRepositoryBuilder; +import io.fabric8.openshift.api.model.miscellaneous.helm.v1beta1.ProjectHelmChartRepositoryList; +import io.fabric8.openshift.api.model.miscellaneous.helm.v1beta1.ProjectHelmChartRepositoryListBuilder; import io.fabric8.openshift.client.OpenShiftClient; import org.junit.jupiter.api.Test; diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/RoleBindingRestrictionTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/RoleBindingRestrictionTest.java index 6723f3adb7f..09f5cfea2dc 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/RoleBindingRestrictionTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/RoleBindingRestrictionTest.java @@ -23,6 +23,7 @@ import org.junit.jupiter.api.Test; import java.net.HttpURLConnection; +import java.util.Collections; import static org.assertj.core.api.Assertions.assertThat; @@ -85,9 +86,8 @@ private RoleBindingRestriction createNewRoleBindingRestriction(String name) { return new RoleBindingRestrictionBuilder() .withNewMetadata().withName(name).endMetadata() .withNewSpec() - .withNewGrouprestriction() - .addToGroups("groups-rolebindingrestriction") - .endGrouprestriction() + .withGrouprestriction( + Collections.singletonMap("groups", Collections.singletonList("groups-rolebindingrestriction"))) .endSpec() .build(); } diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/SecurityContextConstraintsCrudTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/SecurityContextConstraintsCrudTest.java index cd0edf427dd..5d9e755a141 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/SecurityContextConstraintsCrudTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/SecurityContextConstraintsCrudTest.java @@ -23,9 +23,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.Collections; + +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; @EnableOpenShiftMockClient(crud = true) @@ -61,36 +62,33 @@ void crudTest() { //test of Creation - scc = client.securityContextConstraints().create(scc); - assertNotNull(scc); - assertEquals("test-scc", scc.getMetadata().getName()); - assertTrue(scc.getAllowPrivilegedContainer()); - assertEquals("RunAsAny", scc.getRunAsUser().getType()); - assertEquals("RunAsAny", scc.getFsGroup().getType()); - assertEquals("RunAsAny", scc.getSeLinuxContext().getType()); - assertEquals("RunAsAny", scc.getSupplementalGroups().getType()); - assertEquals(1, scc.getUsers().size()); - assertEquals("admin", scc.getUsers().get(0)); - assertEquals(1, scc.getGroups().size()); - assertEquals("admin-group", scc.getGroups().get(0)); + scc = client.securityContextConstraints().resource(scc).create(); + assertThat(scc) + .isNotNull() + .hasFieldOrPropertyWithValue("metadata.name", "test-scc") + .hasFieldOrPropertyWithValue("allowPrivilegedContainer", true) + .hasFieldOrPropertyWithValue("runAsUser.type", "RunAsAny") + .hasFieldOrPropertyWithValue("fsGroup.type", "RunAsAny") + .hasFieldOrPropertyWithValue("seLinuxContext.type", "RunAsAny") + .hasFieldOrPropertyWithValue("supplementalGroups.type", "RunAsAny") + .hasFieldOrPropertyWithValue("users", Collections.singletonList("admin")) + .hasFieldOrPropertyWithValue("groups", Collections.singletonList("admin-group")); //test of list SecurityContextConstraintsList sccList = client.securityContextConstraints().list(); logger.info(sccList.toString()); - assertNotNull(sccList); - assertEquals(1, sccList.getItems().size()); - assertEquals("test-scc", sccList.getItems().get(0).getMetadata().getName()); - assertTrue(sccList.getItems().get(0).getAllowPrivilegedContainer()); - assertEquals("RunAsAny", sccList.getItems().get(0).getRunAsUser().getType()); - assertEquals("RunAsAny", sccList.getItems().get(0).getFsGroup().getType()); - assertEquals("RunAsAny", sccList.getItems().get(0).getSeLinuxContext().getType()); - assertEquals("RunAsAny", sccList.getItems().get(0).getSupplementalGroups().getType()); - assertEquals(1, sccList.getItems().get(0).getUsers().size()); - assertEquals("admin", sccList.getItems().get(0).getUsers().get(0)); - assertEquals(1, sccList.getItems().get(0).getGroups().size()); - assertEquals("admin-group", sccList.getItems().get(0).getGroups().get(0)); + assertThat(sccList.getItems()) + .singleElement() + .hasFieldOrPropertyWithValue("metadata.name", "test-scc") + .hasFieldOrPropertyWithValue("allowPrivilegedContainer", true) + .hasFieldOrPropertyWithValue("runAsUser.type", "RunAsAny") + .hasFieldOrPropertyWithValue("fsGroup.type", "RunAsAny") + .hasFieldOrPropertyWithValue("seLinuxContext.type", "RunAsAny") + .hasFieldOrPropertyWithValue("supplementalGroups.type", "RunAsAny") + .hasFieldOrPropertyWithValue("users", Collections.singletonList("admin")) + .hasFieldOrPropertyWithValue("groups", Collections.singletonList("admin-group")); //test of updation SecurityContextConstraints scc2 = new SecurityContextConstraintsBuilder() @@ -116,17 +114,16 @@ void crudTest() { logger.info("Updated SecurityContextConstraints : " + scc.toString()); - assertNotNull(scc); - assertEquals("test-scc", scc.getMetadata().getName()); - assertFalse(scc.getAllowPrivilegedContainer()); - assertEquals("RunAsAny", scc.getRunAsUser().getType()); - assertEquals("RunAsAny", scc.getFsGroup().getType()); - assertEquals("RunAsAny", scc.getSeLinuxContext().getType()); - assertEquals("RunAsAny", scc.getSupplementalGroups().getType()); - assertEquals(1, scc.getUsers().size()); - assertEquals("admin", scc.getUsers().get(0)); - assertEquals(1, scc.getGroups().size()); - assertEquals("admin-group", scc.getGroups().get(0)); + assertThat(scc) + .isNotNull() + .hasFieldOrPropertyWithValue("metadata.name", "test-scc") + .hasFieldOrPropertyWithValue("allowPrivilegedContainer", false) + .hasFieldOrPropertyWithValue("runAsUser.type", "RunAsAny") + .hasFieldOrPropertyWithValue("fsGroup.type", "RunAsAny") + .hasFieldOrPropertyWithValue("seLinuxContext.type", "RunAsAny") + .hasFieldOrPropertyWithValue("supplementalGroups.type", "RunAsAny") + .hasFieldOrPropertyWithValue("users", Collections.singletonList("admin")) + .hasFieldOrPropertyWithValue("groups", Collections.singletonList("admin-group")); //test of deletion boolean deleted = client.securityContextConstraints().delete(scc).size() == 1; diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/SecurityContextConstraintsTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/SecurityContextConstraintsTest.java index 14f2f091db8..113dbd378d4 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/SecurityContextConstraintsTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/SecurityContextConstraintsTest.java @@ -16,6 +16,7 @@ package io.fabric8.openshift.client.server.mock; import io.fabric8.kubernetes.api.model.HasMetadata; +import io.fabric8.kubernetes.client.dsl.NonDeletingOperation; import io.fabric8.openshift.api.model.SecurityContextConstraints; import io.fabric8.openshift.api.model.SecurityContextConstraintsBuilder; import io.fabric8.openshift.api.model.SecurityContextConstraintsList; @@ -24,12 +25,14 @@ import org.junit.jupiter.api.Test; import java.net.HttpURLConnection; +import java.util.Collections; import java.util.List; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; +import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; @EnableOpenShiftMockClient class SecurityContextConstraintsTest { @@ -53,13 +56,14 @@ void testCreateOrReplace() { .once(); // When - scc = client.securityContextConstraints().createOrReplace(scc); + scc = client.securityContextConstraints().resource(scc).createOr(NonDeletingOperation::update); // Then - assertNotNull(scc); - assertEquals("scc1", scc.getMetadata().getName()); - assertEquals(1, scc.getUsers().size()); - assertEquals(1, scc.getGroups().size()); + assertThat(scc) + .isNotNull() + .hasFieldOrPropertyWithValue("metadata.name", "scc1") + .hasFieldOrPropertyWithValue("users", Collections.singletonList("admin")) + .hasFieldOrPropertyWithValue("groups", Collections.singletonList("admin-group")); } @Test @@ -75,7 +79,7 @@ void testLoad() { // Then assertNotNull(items); assertEquals(1, items.size()); - assertTrue(items.get(0) instanceof SecurityContextConstraints); + assertInstanceOf(SecurityContextConstraints.class, items.get(0)); } @Test @@ -98,13 +102,11 @@ void testDelete() { server.expect().withPath("/apis/security.openshift.io/v1/securitycontextconstraints/scc2") .andReturn(200, new SecurityContextConstraintsBuilder().build()).once(); - boolean deleted = client.securityContextConstraints().withName("scc1").delete().size() == 1; + client.securityContextConstraints().withName("scc1").delete(); - deleted = client.securityContextConstraints().withName("scc1").delete().size() == 1; - assertFalse(deleted); + assertNotEquals(1, client.securityContextConstraints().withName("scc1").delete().size()); - deleted = client.securityContextConstraints().withName("scc2").delete().size() == 1; - assertTrue(deleted); + assertEquals(1, client.securityContextConstraints().withName("scc2").delete().size()); } @Test @@ -113,13 +115,15 @@ void testEdit() { .andReturn(200, new SecurityContextConstraintsBuilder().withNewMetadata().withName("scc1").and().build()).once(); server.expect().patch().withPath("/apis/security.openshift.io/v1/securitycontextconstraints/scc1") .andReturn(200, new SecurityContextConstraintsBuilder().withNewMetadata().withName("scc1").and() - .addToAllowedCapabilities("allowed").build()) + .withAllowedCapabilities(Collections.singletonList("allowed")).build()) .once(); SecurityContextConstraints scc = client.securityContextConstraints().withName("scc1") - .edit(s -> new SecurityContextConstraintsBuilder(s).addToAllowedCapabilities("allowed").build()); - assertNotNull(scc); - assertEquals(1, scc.getAllowedCapabilities().size()); + .edit(s -> new SecurityContextConstraintsBuilder(s).withAllowedCapabilities(Collections.singletonList("allowed")) + .build()); + assertThat(scc) + .isNotNull() + .hasFieldOrPropertyWithValue("allowedCapabilities", Collections.singletonList("allowed")); } } diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/TemplateTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/TemplateTest.java index 97e7c351d5c..52613ef2186 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/TemplateTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/TemplateTest.java @@ -48,6 +48,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -296,16 +297,15 @@ void shouldGetTemplateWithMultipleObjects() { .hasFieldOrPropertyWithValue("additionalProperties.immutable", "${IMMUTABLE}")); } - protected void assertListIsServiceWithPort8080(KubernetesList list) { - assertNotNull(list); + protected static void assertListIsServiceWithPort8080(KubernetesList list) { assertListIsServiceWithPort8080(list.getItems()); } - protected static void assertListIsServiceWithPort8080(List items) { + protected static void assertListIsServiceWithPort8080(List items) { assertNotNull(items); assertEquals(1, items.size()); - HasMetadata item = items.get(0); - assertTrue(item instanceof Service); + HasMetadata item = assertInstanceOf(HasMetadata.class, items.get(0)); + assertInstanceOf(Service.class, item); Service service = (Service) item; ServiceSpec serviceSpec = service.getSpec(); assertNotNull(serviceSpec); @@ -327,8 +327,7 @@ void testLoadParameterizedNumberTemplate() throws IOException { map.put("PORT", "8080"); Template template = client.templates().withParameters(map).withName("tmpl1").get(); - List list = template.getObjects(); - assertListIsServiceWithPort8080(list); + assertListIsServiceWithPort8080(template.getObjects()); } @Test diff --git a/openshift-client-api/src/main/java/io/fabric8/openshift/client/NamespacedOpenShiftClientAdapter.java b/openshift-client-api/src/main/java/io/fabric8/openshift/client/NamespacedOpenShiftClientAdapter.java index a5db3a6d66d..0774ec176c7 100644 --- a/openshift-client-api/src/main/java/io/fabric8/openshift/client/NamespacedOpenShiftClientAdapter.java +++ b/openshift-client-api/src/main/java/io/fabric8/openshift/client/NamespacedOpenShiftClientAdapter.java @@ -36,22 +36,14 @@ import io.fabric8.openshift.api.model.BuildConfig; import io.fabric8.openshift.api.model.BuildConfigList; import io.fabric8.openshift.api.model.BuildList; -import io.fabric8.openshift.api.model.ClusterNetwork; -import io.fabric8.openshift.api.model.ClusterNetworkList; import io.fabric8.openshift.api.model.ClusterRole; import io.fabric8.openshift.api.model.ClusterRoleBinding; import io.fabric8.openshift.api.model.ClusterRoleBindingList; import io.fabric8.openshift.api.model.ClusterRoleList; import io.fabric8.openshift.api.model.DeploymentConfig; import io.fabric8.openshift.api.model.DeploymentConfigList; -import io.fabric8.openshift.api.model.EgressNetworkPolicy; -import io.fabric8.openshift.api.model.EgressNetworkPolicyList; import io.fabric8.openshift.api.model.Group; import io.fabric8.openshift.api.model.GroupList; -import io.fabric8.openshift.api.model.HelmChartRepository; -import io.fabric8.openshift.api.model.HelmChartRepositoryList; -import io.fabric8.openshift.api.model.HostSubnet; -import io.fabric8.openshift.api.model.HostSubnetList; import io.fabric8.openshift.api.model.Identity; import io.fabric8.openshift.api.model.IdentityList; import io.fabric8.openshift.api.model.Image; @@ -67,8 +59,6 @@ import io.fabric8.openshift.api.model.ImageTagList; import io.fabric8.openshift.api.model.LocalResourceAccessReview; import io.fabric8.openshift.api.model.LocalSubjectAccessReview; -import io.fabric8.openshift.api.model.NetNamespace; -import io.fabric8.openshift.api.model.NetNamespaceList; import io.fabric8.openshift.api.model.OAuthAccessToken; import io.fabric8.openshift.api.model.OAuthAccessTokenList; import io.fabric8.openshift.api.model.OAuthAuthorizeToken; @@ -80,8 +70,6 @@ import io.fabric8.openshift.api.model.PodSecurityPolicyReview; import io.fabric8.openshift.api.model.PodSecurityPolicySelfSubjectReview; import io.fabric8.openshift.api.model.PodSecurityPolicySubjectReview; -import io.fabric8.openshift.api.model.ProjectHelmChartRepository; -import io.fabric8.openshift.api.model.ProjectHelmChartRepositoryList; import io.fabric8.openshift.api.model.RangeAllocation; import io.fabric8.openshift.api.model.RangeAllocationList; import io.fabric8.openshift.api.model.ResourceAccessReview; @@ -115,17 +103,20 @@ import io.fabric8.openshift.api.model.miscellaneous.cloudcredential.v1.CredentialsRequestList; import io.fabric8.openshift.api.model.miscellaneous.cncf.cni.v1.NetworkAttachmentDefinition; import io.fabric8.openshift.api.model.miscellaneous.cncf.cni.v1.NetworkAttachmentDefinitionList; -import io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1.ConfigList; +import io.fabric8.openshift.api.model.miscellaneous.helm.v1beta1.HelmChartRepository; +import io.fabric8.openshift.api.model.miscellaneous.helm.v1beta1.HelmChartRepositoryList; +import io.fabric8.openshift.api.model.miscellaneous.helm.v1beta1.ProjectHelmChartRepository; +import io.fabric8.openshift.api.model.miscellaneous.helm.v1beta1.ProjectHelmChartRepositoryList; import io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1.BareMetalHost; import io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1.BareMetalHostList; import io.fabric8.openshift.api.model.miscellaneous.metal3.v1beta1.Metal3Remediation; import io.fabric8.openshift.api.model.miscellaneous.metal3.v1beta1.Metal3RemediationList; import io.fabric8.openshift.api.model.miscellaneous.metal3.v1beta1.Metal3RemediationTemplate; import io.fabric8.openshift.api.model.miscellaneous.metal3.v1beta1.Metal3RemediationTemplateList; -import io.fabric8.openshift.api.model.miscellaneous.network.operator.v1.EgressRouter; -import io.fabric8.openshift.api.model.miscellaneous.network.operator.v1.EgressRouterList; -import io.fabric8.openshift.api.model.miscellaneous.network.operator.v1.OperatorPKI; -import io.fabric8.openshift.api.model.miscellaneous.network.operator.v1.OperatorPKIList; +import io.fabric8.openshift.api.model.operator.network.v1.EgressRouter; +import io.fabric8.openshift.api.model.operator.network.v1.EgressRouterList; +import io.fabric8.openshift.api.model.operator.network.v1.OperatorPKI; +import io.fabric8.openshift.api.model.operator.network.v1.OperatorPKIList; import io.fabric8.openshift.client.dsl.BuildConfigResource; import io.fabric8.openshift.client.dsl.BuildResource; import io.fabric8.openshift.client.dsl.DeployableScalableResource; @@ -267,7 +258,7 @@ public NameableCreateOrDeleteable imageSignatures() { } @Override - public NonNamespaceOperation> imageRegistryOperatorConfigs() { + public NonNamespaceOperation> imageRegistryOperatorConfigs() { return getClient().imageRegistryOperatorConfigs(); } @@ -426,26 +417,6 @@ public OpenShiftMonitoringAPIGroupDSL monitoring() { return getClient().monitoring(); } - @Override - public NonNamespaceOperation> netNamespaces() { - return getClient().netNamespaces(); - } - - @Override - public NonNamespaceOperation> clusterNetworks() { - return getClient().clusterNetworks(); - } - - @Override - public MixedOperation> egressNetworkPolicies() { - return getClient().egressNetworkPolicies(); - } - - @Override - public NonNamespaceOperation> hostSubnets() { - return getClient().hostSubnets(); - } - @Override public NonNamespaceOperation> apiRequestCounts() { return getClient().apiRequestCounts(); diff --git a/openshift-client-api/src/main/java/io/fabric8/openshift/client/OpenShiftClient.java b/openshift-client-api/src/main/java/io/fabric8/openshift/client/OpenShiftClient.java index ba9f298ac58..1818489f795 100644 --- a/openshift-client-api/src/main/java/io/fabric8/openshift/client/OpenShiftClient.java +++ b/openshift-client-api/src/main/java/io/fabric8/openshift/client/OpenShiftClient.java @@ -43,22 +43,14 @@ import io.fabric8.openshift.api.model.BuildConfig; import io.fabric8.openshift.api.model.BuildConfigList; import io.fabric8.openshift.api.model.BuildList; -import io.fabric8.openshift.api.model.ClusterNetwork; -import io.fabric8.openshift.api.model.ClusterNetworkList; import io.fabric8.openshift.api.model.ClusterRole; import io.fabric8.openshift.api.model.ClusterRoleBinding; import io.fabric8.openshift.api.model.ClusterRoleBindingList; import io.fabric8.openshift.api.model.ClusterRoleList; import io.fabric8.openshift.api.model.DeploymentConfig; import io.fabric8.openshift.api.model.DeploymentConfigList; -import io.fabric8.openshift.api.model.EgressNetworkPolicy; -import io.fabric8.openshift.api.model.EgressNetworkPolicyList; import io.fabric8.openshift.api.model.Group; import io.fabric8.openshift.api.model.GroupList; -import io.fabric8.openshift.api.model.HelmChartRepository; -import io.fabric8.openshift.api.model.HelmChartRepositoryList; -import io.fabric8.openshift.api.model.HostSubnet; -import io.fabric8.openshift.api.model.HostSubnetList; import io.fabric8.openshift.api.model.Identity; import io.fabric8.openshift.api.model.IdentityList; import io.fabric8.openshift.api.model.Image; @@ -74,8 +66,6 @@ import io.fabric8.openshift.api.model.ImageTagList; import io.fabric8.openshift.api.model.LocalResourceAccessReview; import io.fabric8.openshift.api.model.LocalSubjectAccessReview; -import io.fabric8.openshift.api.model.NetNamespace; -import io.fabric8.openshift.api.model.NetNamespaceList; import io.fabric8.openshift.api.model.OAuthAccessToken; import io.fabric8.openshift.api.model.OAuthAccessTokenList; import io.fabric8.openshift.api.model.OAuthAuthorizeToken; @@ -87,8 +77,6 @@ import io.fabric8.openshift.api.model.PodSecurityPolicyReview; import io.fabric8.openshift.api.model.PodSecurityPolicySelfSubjectReview; import io.fabric8.openshift.api.model.PodSecurityPolicySubjectReview; -import io.fabric8.openshift.api.model.ProjectHelmChartRepository; -import io.fabric8.openshift.api.model.ProjectHelmChartRepositoryList; import io.fabric8.openshift.api.model.RangeAllocation; import io.fabric8.openshift.api.model.RangeAllocationList; import io.fabric8.openshift.api.model.ResourceAccessReview; @@ -122,16 +110,20 @@ import io.fabric8.openshift.api.model.miscellaneous.cloudcredential.v1.CredentialsRequestList; import io.fabric8.openshift.api.model.miscellaneous.cncf.cni.v1.NetworkAttachmentDefinition; import io.fabric8.openshift.api.model.miscellaneous.cncf.cni.v1.NetworkAttachmentDefinitionList; +import io.fabric8.openshift.api.model.miscellaneous.helm.v1beta1.HelmChartRepository; +import io.fabric8.openshift.api.model.miscellaneous.helm.v1beta1.HelmChartRepositoryList; +import io.fabric8.openshift.api.model.miscellaneous.helm.v1beta1.ProjectHelmChartRepository; +import io.fabric8.openshift.api.model.miscellaneous.helm.v1beta1.ProjectHelmChartRepositoryList; import io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1.BareMetalHost; import io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1.BareMetalHostList; import io.fabric8.openshift.api.model.miscellaneous.metal3.v1beta1.Metal3Remediation; import io.fabric8.openshift.api.model.miscellaneous.metal3.v1beta1.Metal3RemediationList; import io.fabric8.openshift.api.model.miscellaneous.metal3.v1beta1.Metal3RemediationTemplate; import io.fabric8.openshift.api.model.miscellaneous.metal3.v1beta1.Metal3RemediationTemplateList; -import io.fabric8.openshift.api.model.miscellaneous.network.operator.v1.EgressRouter; -import io.fabric8.openshift.api.model.miscellaneous.network.operator.v1.EgressRouterList; -import io.fabric8.openshift.api.model.miscellaneous.network.operator.v1.OperatorPKI; -import io.fabric8.openshift.api.model.miscellaneous.network.operator.v1.OperatorPKIList; +import io.fabric8.openshift.api.model.operator.network.v1.EgressRouter; +import io.fabric8.openshift.api.model.operator.network.v1.EgressRouterList; +import io.fabric8.openshift.api.model.operator.network.v1.OperatorPKI; +import io.fabric8.openshift.api.model.operator.network.v1.OperatorPKIList; import io.fabric8.openshift.client.dsl.BuildConfigResource; import io.fabric8.openshift.client.dsl.BuildResource; import io.fabric8.openshift.client.dsl.DeployableScalableResource; @@ -270,34 +262,6 @@ public interface OpenShiftClient extends KubernetesClient, SupportTestingClient */ OpenShiftMonitoringAPIGroupDSL monitoring(); - /** - * API entrypoint for handling NetNamespace(network.openshift.io/v1) - * - * @return NonNamespaceOperation instance for NetNamespace object - */ - NonNamespaceOperation> netNamespaces(); - - /** - * API entrypoint for handling ClusterNetwork(network.openshift.io/v1) - * - * @return NonNamespaceOperation instance for ClusterNetwork object - */ - NonNamespaceOperation> clusterNetworks(); - - /** - * API entrypoint for handling EgressNetworkPolicy(network.openshift.io/v1) - * - * @return MixedOperation instance for EgressNetworkPolicy object - */ - MixedOperation> egressNetworkPolicies(); - - /** - * API entrypoint for HostSubnet (network.openshift.io/v1) - * - * @return {@link NonNamespaceOperation} for HostSubnet - */ - NonNamespaceOperation> hostSubnets(); - /** * {@inheritDoc} */ @@ -445,7 +409,7 @@ public interface OpenShiftClient extends KubernetesClient, SupportTestingClient * * @return {@link NonNamespaceOperation} for Config */ - NonNamespaceOperation> imageRegistryOperatorConfigs(); + NonNamespaceOperation> imageRegistryOperatorConfigs(); /** * API entrypoint for Metal3Remediation (infrastructure.cluster.x-k8s.io/v1beta1) @@ -631,7 +595,7 @@ public interface OpenShiftClient extends KubernetesClient, SupportTestingClient /** * API entrypoint for SubjectAccessReview (authorization.openshift.io/v1) - * This only supports create operation. SubjectAccessReviewResponse from server is returned as output + * This only supports create operation. SubjectAccessReviewResponse from server is returned as output. * * @return {@link InOutCreateable} for SubjectAccessReview */ diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/core/TemplateOperationsImpl.java b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/core/TemplateOperationsImpl.java index cc215dac61b..4badfb77410 100644 --- a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/core/TemplateOperationsImpl.java +++ b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/core/TemplateOperationsImpl.java @@ -117,9 +117,13 @@ public KubernetesList process(Map valuesMap) { .post(JSON, getKubernetesSerialization().asJson(t)) .url(getProcessUrl()); t = handleResponse(requestBuilder); - KubernetesList l = new KubernetesList(); - l.setItems(t.getObjects()); - return l; + final KubernetesListBuilder klb = new KubernetesListBuilder(); + for (Object object : t.getObjects()) { + if (object instanceof HasMetadata) { + klb.addToItems((HasMetadata) object); + } + } + return klb.build(); } catch (Exception e) { throw KubernetesClientException.launderThrowable(forOperationType("process"), e); } @@ -166,14 +170,15 @@ public TemplateOperationsImpl withParameters(Map parameters) { public KubernetesList processLocally(Map valuesMap) { Template t = processParameters(getItemOrRequireFromServer()); + final KubernetesListBuilder klb = new KubernetesListBuilder(); + for (Object object : t.getObjects()) { + if (object instanceof HasMetadata) { + klb.addToItems((HasMetadata) object); + } + } + String json = getKubernetesSerialization().asJson(klb.build()); List parameters = t.getParameters(); - KubernetesList list = new KubernetesListBuilder() - .withItems(t.getObjects()) - .build(); - - String json = getKubernetesSerialization().asJson(list); String last = null; - if (parameters != null && !parameters.isEmpty()) { while (!Objects.equals(last, json)) { last = json; diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/impl/OpenShiftClientImpl.java b/openshift-client/src/main/java/io/fabric8/openshift/client/impl/OpenShiftClientImpl.java index 2055938071e..fc3fa142d22 100644 --- a/openshift-client/src/main/java/io/fabric8/openshift/client/impl/OpenShiftClientImpl.java +++ b/openshift-client/src/main/java/io/fabric8/openshift/client/impl/OpenShiftClientImpl.java @@ -47,22 +47,14 @@ import io.fabric8.openshift.api.model.BuildConfig; import io.fabric8.openshift.api.model.BuildConfigList; import io.fabric8.openshift.api.model.BuildList; -import io.fabric8.openshift.api.model.ClusterNetwork; -import io.fabric8.openshift.api.model.ClusterNetworkList; import io.fabric8.openshift.api.model.ClusterRole; import io.fabric8.openshift.api.model.ClusterRoleBinding; import io.fabric8.openshift.api.model.ClusterRoleBindingList; import io.fabric8.openshift.api.model.ClusterRoleList; import io.fabric8.openshift.api.model.DeploymentConfig; import io.fabric8.openshift.api.model.DeploymentConfigList; -import io.fabric8.openshift.api.model.EgressNetworkPolicy; -import io.fabric8.openshift.api.model.EgressNetworkPolicyList; import io.fabric8.openshift.api.model.Group; import io.fabric8.openshift.api.model.GroupList; -import io.fabric8.openshift.api.model.HelmChartRepository; -import io.fabric8.openshift.api.model.HelmChartRepositoryList; -import io.fabric8.openshift.api.model.HostSubnet; -import io.fabric8.openshift.api.model.HostSubnetList; import io.fabric8.openshift.api.model.Identity; import io.fabric8.openshift.api.model.IdentityList; import io.fabric8.openshift.api.model.Image; @@ -79,8 +71,6 @@ import io.fabric8.openshift.api.model.ImageTagList; import io.fabric8.openshift.api.model.LocalResourceAccessReview; import io.fabric8.openshift.api.model.LocalSubjectAccessReview; -import io.fabric8.openshift.api.model.NetNamespace; -import io.fabric8.openshift.api.model.NetNamespaceList; import io.fabric8.openshift.api.model.OAuthAccessToken; import io.fabric8.openshift.api.model.OAuthAccessTokenList; import io.fabric8.openshift.api.model.OAuthAuthorizeToken; @@ -92,8 +82,6 @@ import io.fabric8.openshift.api.model.PodSecurityPolicyReview; import io.fabric8.openshift.api.model.PodSecurityPolicySelfSubjectReview; import io.fabric8.openshift.api.model.PodSecurityPolicySubjectReview; -import io.fabric8.openshift.api.model.ProjectHelmChartRepository; -import io.fabric8.openshift.api.model.ProjectHelmChartRepositoryList; import io.fabric8.openshift.api.model.ProjectRequest; import io.fabric8.openshift.api.model.RangeAllocation; import io.fabric8.openshift.api.model.RangeAllocationList; @@ -129,17 +117,20 @@ import io.fabric8.openshift.api.model.miscellaneous.cloudcredential.v1.CredentialsRequestList; import io.fabric8.openshift.api.model.miscellaneous.cncf.cni.v1.NetworkAttachmentDefinition; import io.fabric8.openshift.api.model.miscellaneous.cncf.cni.v1.NetworkAttachmentDefinitionList; -import io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1.ConfigList; +import io.fabric8.openshift.api.model.miscellaneous.helm.v1beta1.HelmChartRepository; +import io.fabric8.openshift.api.model.miscellaneous.helm.v1beta1.HelmChartRepositoryList; +import io.fabric8.openshift.api.model.miscellaneous.helm.v1beta1.ProjectHelmChartRepository; +import io.fabric8.openshift.api.model.miscellaneous.helm.v1beta1.ProjectHelmChartRepositoryList; import io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1.BareMetalHost; import io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1.BareMetalHostList; import io.fabric8.openshift.api.model.miscellaneous.metal3.v1beta1.Metal3Remediation; import io.fabric8.openshift.api.model.miscellaneous.metal3.v1beta1.Metal3RemediationList; import io.fabric8.openshift.api.model.miscellaneous.metal3.v1beta1.Metal3RemediationTemplate; import io.fabric8.openshift.api.model.miscellaneous.metal3.v1beta1.Metal3RemediationTemplateList; -import io.fabric8.openshift.api.model.miscellaneous.network.operator.v1.EgressRouter; -import io.fabric8.openshift.api.model.miscellaneous.network.operator.v1.EgressRouterList; -import io.fabric8.openshift.api.model.miscellaneous.network.operator.v1.OperatorPKI; -import io.fabric8.openshift.api.model.miscellaneous.network.operator.v1.OperatorPKIList; +import io.fabric8.openshift.api.model.operator.network.v1.EgressRouter; +import io.fabric8.openshift.api.model.operator.network.v1.EgressRouterList; +import io.fabric8.openshift.api.model.operator.network.v1.OperatorPKI; +import io.fabric8.openshift.api.model.operator.network.v1.OperatorPKIList; import io.fabric8.openshift.client.NamespacedOpenShiftClient; import io.fabric8.openshift.client.OpenShiftConfig; import io.fabric8.openshift.client.dsl.BuildConfigResource; @@ -355,9 +346,9 @@ public NameableCreateOrDeleteable imageSignatures() { } @Override - public NonNamespaceOperation> imageRegistryOperatorConfigs() { - return resources(io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1.Config.class, - ConfigList.class); + public NonNamespaceOperation> imageRegistryOperatorConfigs() { + return resources(io.fabric8.openshift.api.model.operator.imageregistry.v1.Config.class, + io.fabric8.openshift.api.model.operator.imageregistry.v1.ConfigList.class); } @Override @@ -582,26 +573,6 @@ public OpenShiftMonitoringAPIGroupDSL monitoring() { return adapt(OpenShiftMonitoringAPIGroupClient.class); } - @Override - public NonNamespaceOperation> netNamespaces() { - return resources(NetNamespace.class, NetNamespaceList.class); - } - - @Override - public NonNamespaceOperation> clusterNetworks() { - return resources(ClusterNetwork.class, ClusterNetworkList.class); - } - - @Override - public MixedOperation> egressNetworkPolicies() { - return resources(EgressNetworkPolicy.class, EgressNetworkPolicyList.class); - } - - @Override - public NonNamespaceOperation> hostSubnets() { - return resources(HostSubnet.class, HostSubnetList.class); - } - @Override public NonNamespaceOperation> apiRequestCounts() { return resources(APIRequestCount.class, APIRequestCountList.class);