diff --git a/Makefile b/Makefile index 3b93c7a721d..f33edbfc481 100644 --- a/Makefile +++ b/Makefile @@ -63,6 +63,7 @@ generate-openapi-classes: cd kubernetes-model-generator/openshift-model-operatorhub && mvn -Pgenerate clean install cd kubernetes-model-generator/openshift-model-console && mvn -Pgenerate clean install cd kubernetes-model-generator/openshift-model-autoscaling && mvn -Pgenerate clean install + cd kubernetes-model-generator/openshift-model-machine && mvn -Pgenerate clean install # Legacy generation of the model: TODO: remove .PHONY: generate-model-legacy diff --git a/kubernetes-model-generator/generateModel.sh b/kubernetes-model-generator/generateModel.sh index 20c1db12dd4..ed82ce1224c 100755 --- a/kubernetes-model-generator/generateModel.sh +++ b/kubernetes-model-generator/generateModel.sh @@ -23,7 +23,6 @@ ABSOLUTE_BASEDIR=$(realpath "$BASEDIR") # Array for all existing modules declare -a modules=( "openshift-model-hive" - "openshift-model-machine" "openshift-model-installer" "openshift-model-machineconfig" "openshift-model-monitoring" diff --git a/kubernetes-model-generator/openapi/generator/main.go b/kubernetes-model-generator/openapi/generator/main.go index 03abc53883f..e41015c9767 100644 --- a/kubernetes-model-generator/openapi/generator/main.go +++ b/kubernetes-model-generator/openapi/generator/main.go @@ -18,6 +18,8 @@ package main import ( "github.com/getkin/kin-openapi/openapi3" openshiftauthorizationv1 "github.com/openshift/api/authorization/v1" + openshiftmachinev1 "github.com/openshift/api/machine/v1" + openshiftmachinev1alpha1 "github.com/openshift/api/machine/v1alpha1" openshiftsecurityv1 "github.com/openshift/api/security/v1" admissionV1 "k8s.io/api/admission/v1" admissionV1Beta1 "k8s.io/api/admission/v1beta1" @@ -140,6 +142,12 @@ func main() { reflect.TypeOf(openshiftauthorizationv1.SubjectAccessReviewResponse{}), reflect.TypeOf(openshiftauthorizationv1.ResourceAccessReviewResponse{}), }, "openshift-authorization"), + // Provider Specs are not included in OpenAPI https://docs.openshift.com/container-platform/4.16/machine_management/index.html#machine-mgmt-intro-managing-compute_overview-of-machine-management + NewPathSchema(map[reflect.Type]ApiVersion{ + reflect.TypeOf(openshiftmachinev1alpha1.OpenstackProviderSpec{}): {false, openshiftmachinev1alpha1.GroupVersion.String(), "openstackproviderspecs", true}, + reflect.TypeOf(openshiftmachinev1.NutanixMachineProviderConfig{}): {false, openshiftmachinev1.GroupVersion.String(), "nutanixmachineproviderconfigs", true}, + reflect.TypeOf(openshiftmachinev1.PowerVSMachineProviderConfig{}): {false, openshiftmachinev1.GroupVersion.String(), "powervsmachineproviderconfigs", true}, + }, "openshift-machine"), // 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}, diff --git a/kubernetes-model-generator/openapi/schemas/openshift-machine.json b/kubernetes-model-generator/openapi/schemas/openshift-machine.json new file mode 100644 index 00000000000..6fa2b05c323 --- /dev/null +++ b/kubernetes-model-generator/openapi/schemas/openshift-machine.json @@ -0,0 +1 @@ +{"components":{"schemas":{"com.github.openshift.api.machine.v1.LoadBalancerReference":{"properties":{"name":{"type":"string"},"type":{"type":"string"}},"type":"object"},"com.github.openshift.api.machine.v1.NutanixCategory":{"properties":{"key":{"type":"string"},"value":{"type":"string"}},"type":"object"},"com.github.openshift.api.machine.v1.NutanixFailureDomainReference":{"properties":{"name":{"type":"string"}},"type":"object"},"com.github.openshift.api.machine.v1.NutanixGPU":{"properties":{"deviceID":{"format":"int32","type":"integer"},"name":{"type":"string"},"type":{"type":"string"}},"type":"object"},"com.github.openshift.api.machine.v1.NutanixMachineProviderConfig":{"properties":{"apiVersion":{"type":"string"},"bootType":{"type":"string"},"categories":{"items":{"$ref":"#/components/schemas/com.github.openshift.api.machine.v1.NutanixCategory"},"type":"array"},"cluster":{"$ref":"#/components/schemas/com.github.openshift.api.machine.v1.NutanixResourceIdentifier"},"credentialsSecret":{"$ref":"#/components/schemas/io.k8s.api.core.v1.LocalObjectReference"},"dataDisks":{"items":{"$ref":"#/components/schemas/com.github.openshift.api.machine.v1.NutanixVMDisk"},"type":"array"},"failureDomain":{"$ref":"#/components/schemas/com.github.openshift.api.machine.v1.NutanixFailureDomainReference"},"gpus":{"items":{"$ref":"#/components/schemas/com.github.openshift.api.machine.v1.NutanixGPU"},"type":"array"},"image":{"$ref":"#/components/schemas/com.github.openshift.api.machine.v1.NutanixResourceIdentifier"},"kind":{"type":"string"},"memorySize":{"$ref":"#/components/schemas/io.k8s.apimachinery.pkg.api.resource.Quantity"},"metadata":{"$ref":"#/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta"},"project":{"$ref":"#/components/schemas/com.github.openshift.api.machine.v1.NutanixResourceIdentifier"},"subnets":{"items":{"$ref":"#/components/schemas/com.github.openshift.api.machine.v1.NutanixResourceIdentifier"},"type":"array"},"systemDiskSize":{"$ref":"#/components/schemas/io.k8s.apimachinery.pkg.api.resource.Quantity"},"userDataSecret":{"$ref":"#/components/schemas/io.k8s.api.core.v1.LocalObjectReference"},"vcpuSockets":{"format":"int32","type":"integer"},"vcpusPerSocket":{"format":"int32","type":"integer"}},"type":"object"},"com.github.openshift.api.machine.v1.NutanixResourceIdentifier":{"properties":{"name":{"type":"string"},"type":{"type":"string"},"uuid":{"type":"string"}},"type":"object"},"com.github.openshift.api.machine.v1.NutanixStorageResourceIdentifier":{"properties":{"type":{"type":"string"},"uuid":{"type":"string"}},"type":"object"},"com.github.openshift.api.machine.v1.NutanixVMDisk":{"properties":{"dataSource":{"$ref":"#/components/schemas/com.github.openshift.api.machine.v1.NutanixResourceIdentifier"},"deviceProperties":{"$ref":"#/components/schemas/com.github.openshift.api.machine.v1.NutanixVMDiskDeviceProperties"},"diskSize":{"$ref":"#/components/schemas/io.k8s.apimachinery.pkg.api.resource.Quantity"},"storageConfig":{"$ref":"#/components/schemas/com.github.openshift.api.machine.v1.NutanixVMStorageConfig"}},"type":"object"},"com.github.openshift.api.machine.v1.NutanixVMDiskDeviceProperties":{"properties":{"adapterType":{"type":"string"},"deviceIndex":{"format":"int32","type":"integer"},"deviceType":{"type":"string"}},"type":"object"},"com.github.openshift.api.machine.v1.NutanixVMStorageConfig":{"properties":{"diskMode":{"type":"string"},"storageContainer":{"$ref":"#/components/schemas/com.github.openshift.api.machine.v1.NutanixStorageResourceIdentifier"}},"type":"object"},"com.github.openshift.api.machine.v1.PowerVSMachineProviderConfig":{"properties":{"apiVersion":{"type":"string"},"credentialsSecret":{"$ref":"#/components/schemas/com.github.openshift.api.machine.v1.PowerVSSecretReference"},"image":{"$ref":"#/components/schemas/com.github.openshift.api.machine.v1.PowerVSResource"},"keyPairName":{"type":"string"},"kind":{"type":"string"},"loadBalancers":{"items":{"$ref":"#/components/schemas/com.github.openshift.api.machine.v1.LoadBalancerReference"},"type":"array"},"memoryGiB":{"format":"int32","type":"integer"},"metadata":{"$ref":"#/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta"},"network":{"$ref":"#/components/schemas/com.github.openshift.api.machine.v1.PowerVSResource"},"processorType":{"type":"string"},"processors":{"$ref":"#/components/schemas/io.k8s.apimachinery.pkg.util.intstr.IntOrString"},"serviceInstance":{"$ref":"#/components/schemas/com.github.openshift.api.machine.v1.PowerVSResource"},"systemType":{"type":"string"},"userDataSecret":{"$ref":"#/components/schemas/com.github.openshift.api.machine.v1.PowerVSSecretReference"}},"type":"object"},"com.github.openshift.api.machine.v1.PowerVSResource":{"properties":{"id":{"type":"string"},"name":{"type":"string"},"regex":{"type":"string"},"type":{"type":"string"}},"type":"object"},"com.github.openshift.api.machine.v1.PowerVSSecretReference":{"properties":{"name":{"type":"string"}},"type":"object"},"com.github.openshift.api.machine.v1alpha1.AdditionalBlockDevice":{"properties":{"name":{"type":"string"},"sizeGiB":{"format":"int32","type":"integer"},"storage":{"$ref":"#/components/schemas/com.github.openshift.api.machine.v1alpha1.BlockDeviceStorage"}},"type":"object"},"com.github.openshift.api.machine.v1alpha1.AddressPair":{"properties":{"ipAddress":{"type":"string"},"macAddress":{"type":"string"}},"type":"object"},"com.github.openshift.api.machine.v1alpha1.BlockDeviceStorage":{"properties":{"type":{"type":"string"},"volume":{"$ref":"#/components/schemas/com.github.openshift.api.machine.v1alpha1.BlockDeviceVolume"}},"type":"object"},"com.github.openshift.api.machine.v1alpha1.BlockDeviceVolume":{"properties":{"availabilityZone":{"type":"string"},"type":{"type":"string"}},"type":"object"},"com.github.openshift.api.machine.v1alpha1.Filter":{"properties":{"adminStateUp":{"type":"boolean"},"description":{"type":"string"},"id":{"type":"string"},"limit":{"format":"int32","type":"integer"},"marker":{"type":"string"},"name":{"type":"string"},"notTags":{"type":"string"},"notTagsAny":{"type":"string"},"projectId":{"type":"string"},"shared":{"type":"boolean"},"sortDir":{"type":"string"},"sortKey":{"type":"string"},"status":{"type":"string"},"tags":{"type":"string"},"tagsAny":{"type":"string"},"tenantId":{"type":"string"}},"type":"object"},"com.github.openshift.api.machine.v1alpha1.FixedIPs":{"properties":{"ipAddress":{"type":"string"},"subnetID":{"type":"string"}},"type":"object"},"com.github.openshift.api.machine.v1alpha1.NetworkParam":{"properties":{"filter":{"$ref":"#/components/schemas/com.github.openshift.api.machine.v1alpha1.Filter"},"fixedIp":{"type":"string"},"noAllowedAddressPairs":{"type":"boolean"},"portSecurity":{"type":"boolean"},"portTags":{"items":{"type":"string"},"type":"array"},"profile":{"additionalProperties":{"type":"string"},"type":"object"},"subnets":{"items":{"$ref":"#/components/schemas/com.github.openshift.api.machine.v1alpha1.SubnetParam"},"type":"array"},"uuid":{"type":"string"},"vnicType":{"type":"string"}},"type":"object"},"com.github.openshift.api.machine.v1alpha1.OpenstackProviderSpec":{"properties":{"additionalBlockDevices":{"items":{"$ref":"#/components/schemas/com.github.openshift.api.machine.v1alpha1.AdditionalBlockDevice"},"type":"array"},"apiVersion":{"type":"string"},"availabilityZone":{"type":"string"},"cloudName":{"type":"string"},"cloudsSecret":{"$ref":"#/components/schemas/io.k8s.api.core.v1.SecretReference"},"configDrive":{"type":"boolean"},"flavor":{"type":"string"},"floatingIP":{"type":"string"},"image":{"type":"string"},"keyName":{"type":"string"},"kind":{"type":"string"},"metadata":{"$ref":"#/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta"},"networks":{"items":{"$ref":"#/components/schemas/com.github.openshift.api.machine.v1alpha1.NetworkParam"},"type":"array"},"ports":{"items":{"$ref":"#/components/schemas/com.github.openshift.api.machine.v1alpha1.PortOpts"},"type":"array"},"primarySubnet":{"type":"string"},"rootVolume":{"$ref":"#/components/schemas/com.github.openshift.api.machine.v1alpha1.RootVolume"},"securityGroups":{"items":{"$ref":"#/components/schemas/com.github.openshift.api.machine.v1alpha1.SecurityGroupParam"},"type":"array"},"serverGroupID":{"type":"string"},"serverGroupName":{"type":"string"},"serverMetadata":{"additionalProperties":{"type":"string"},"type":"object"},"sshUserName":{"type":"string"},"tags":{"items":{"type":"string"},"type":"array"},"trunk":{"type":"boolean"},"userDataSecret":{"$ref":"#/components/schemas/io.k8s.api.core.v1.SecretReference"}},"type":"object"},"com.github.openshift.api.machine.v1alpha1.PortOpts":{"properties":{"adminStateUp":{"type":"boolean"},"allowedAddressPairs":{"items":{"$ref":"#/components/schemas/com.github.openshift.api.machine.v1alpha1.AddressPair"},"type":"array"},"description":{"type":"string"},"fixedIPs":{"items":{"$ref":"#/components/schemas/com.github.openshift.api.machine.v1alpha1.FixedIPs"},"type":"array"},"hostID":{"type":"string"},"macAddress":{"type":"string"},"nameSuffix":{"type":"string"},"networkID":{"type":"string"},"portSecurity":{"type":"boolean"},"profile":{"additionalProperties":{"type":"string"},"type":"object"},"projectID":{"type":"string"},"securityGroups":{"items":{"type":"string"},"type":"array"},"tags":{"items":{"type":"string"},"type":"array"},"tenantID":{"type":"string"},"trunk":{"type":"boolean"},"vnicType":{"type":"string"}},"type":"object"},"com.github.openshift.api.machine.v1alpha1.RootVolume":{"properties":{"availabilityZone":{"type":"string"},"deviceType":{"type":"string"},"diskSize":{"format":"int32","type":"integer"},"sourceType":{"type":"string"},"sourceUUID":{"type":"string"},"volumeType":{"type":"string"}},"type":"object"},"com.github.openshift.api.machine.v1alpha1.SecurityGroupFilter":{"properties":{"description":{"type":"string"},"id":{"type":"string"},"limit":{"format":"int32","type":"integer"},"marker":{"type":"string"},"name":{"type":"string"},"notTags":{"type":"string"},"notTagsAny":{"type":"string"},"projectId":{"type":"string"},"sortDir":{"type":"string"},"sortKey":{"type":"string"},"tags":{"type":"string"},"tagsAny":{"type":"string"},"tenantId":{"type":"string"}},"type":"object"},"com.github.openshift.api.machine.v1alpha1.SecurityGroupParam":{"properties":{"filter":{"$ref":"#/components/schemas/com.github.openshift.api.machine.v1alpha1.SecurityGroupFilter"},"name":{"type":"string"},"uuid":{"type":"string"}},"type":"object"},"com.github.openshift.api.machine.v1alpha1.SubnetFilter":{"properties":{"cidr":{"type":"string"},"description":{"type":"string"},"enableDhcp":{"type":"boolean"},"gateway_ip":{"type":"string"},"id":{"type":"string"},"ipVersion":{"format":"int32","type":"integer"},"ipv6AddressMode":{"type":"string"},"ipv6RaMode":{"type":"string"},"limit":{"format":"int32","type":"integer"},"marker":{"type":"string"},"name":{"type":"string"},"networkId":{"type":"string"},"notTags":{"type":"string"},"notTagsAny":{"type":"string"},"projectId":{"type":"string"},"sortDir":{"type":"string"},"sortKey":{"type":"string"},"subnetpoolId":{"type":"string"},"tags":{"type":"string"},"tagsAny":{"type":"string"},"tenantId":{"type":"string"}},"type":"object"},"com.github.openshift.api.machine.v1alpha1.SubnetParam":{"properties":{"filter":{"$ref":"#/components/schemas/com.github.openshift.api.machine.v1alpha1.SubnetFilter"},"portSecurity":{"type":"boolean"},"portTags":{"items":{"type":"string"},"type":"array"},"uuid":{"type":"string"}},"type":"object"},"io.k8s.api.core.v1.LocalObjectReference":{"properties":{"name":{"type":"string"}},"type":"object"},"io.k8s.api.core.v1.SecretReference":{"properties":{"name":{"type":"string"},"namespace":{"type":"string"}},"type":"object"},"io.k8s.apimachinery.pkg.api.resource.Quantity":{"properties":{"Format":{"type":"string"}},"type":"object"},"io.k8s.apimachinery.pkg.apis.meta.v1.FieldsV1":{"properties":{"-":{"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"},"io.k8s.apimachinery.pkg.util.intstr.IntOrString":{"properties":{"IntVal":{"format":"int32","type":"integer"},"StrVal":{"type":"string"},"Type":{"format":"int64","type":"integer"}},"type":"object"}}},"info":{"title":"openshift-machine","version":"0.0.0"},"openapi":"3.0.0","paths":{"/apis/machine.openshift.io/v1/namespaces/{namespace}/nutanixmachineproviderconfigs/{name}":{"get":{"parameters":[{"in":"path","name":"namespace","required":true},{"in":"path","name":"name","required":true}],"responses":{"200":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/com.github.openshift.api.machine.v1.NutanixMachineProviderConfig"}}},"description":"OK"},"default":{"description":""}},"x-kubernetes-group-version-kind":{"group":"machine.openshift.io","kind":"NutanixMachineProviderConfig","version":"v1"}}},"/apis/machine.openshift.io/v1/namespaces/{namespace}/powervsmachineproviderconfigs/{name}":{"get":{"parameters":[{"in":"path","name":"namespace","required":true},{"in":"path","name":"name","required":true}],"responses":{"200":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/com.github.openshift.api.machine.v1.PowerVSMachineProviderConfig"}}},"description":"OK"},"default":{"description":""}},"x-kubernetes-group-version-kind":{"group":"machine.openshift.io","kind":"PowerVSMachineProviderConfig","version":"v1"}}},"/apis/machine.openshift.io/v1alpha1/namespaces/{namespace}/openstackproviderspecs/{name}":{"get":{"parameters":[{"in":"path","name":"namespace","required":true},{"in":"path","name":"name","required":true}],"responses":{"200":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/com.github.openshift.api.machine.v1alpha1.OpenstackProviderSpec"}}},"description":"OK"},"default":{"description":""}},"x-kubernetes-group-version-kind":{"group":"machine.openshift.io","kind":"OpenstackProviderSpec","version":"v1alpha1"}}}}} \ No newline at end of file diff --git a/kubernetes-model-generator/openshift-model-machine/Makefile b/kubernetes-model-generator/openshift-model-machine/Makefile deleted file mode 100644 index c09a7003874..00000000000 --- a/kubernetes-model-generator/openshift-model-machine/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-machine/cmd/generate/generate.go b/kubernetes-model-generator/openshift-model-machine/cmd/generate/generate.go deleted file mode 100644 index 8a6940c4777..00000000000 --- a/kubernetes-model-generator/openshift-model-machine/cmd/generate/generate.go +++ /dev/null @@ -1,110 +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" - apimachineryversion "k8s.io/apimachinery/pkg/version" - runtime "k8s.io/apimachinery/pkg/runtime" - "log" - "reflect" - "strings" - "time" - machineapi "github.com/openshift/api/machine/v1beta1" - v1machineapi "github.com/openshift/api/machine/v1" - v1alpha1machineapi "github.com/openshift/api/machine/v1alpha1" - - "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 - MachineHealthCheck machineapi.MachineHealthCheck - MachineHealthCheckList machineapi.MachineHealthCheckList - Machine machineapi.Machine - MachineList machineapi.MachineList - MachineSet machineapi.MachineSet - MachineSetList machineapi.MachineSetList - V1NutanixCategory v1machineapi.NutanixCategory - V1NutanixResourceIdentifier v1machineapi.NutanixResourceIdentifier - ControlPlaneMachineSet v1machineapi.ControlPlaneMachineSet - ControlPlaneMachineSetList v1machineapi.ControlPlaneMachineSetList - V1Alpha1SubnetFilter v1alpha1machineapi.SubnetFilter - V1Alpha1OpenStackProviderSpec v1alpha1machineapi.OpenstackProviderSpec -} - -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/machine/v1beta1", "", "io.fabric8.openshift.api.model.machine.v1beta1", "os_machine_v1beta1_", true}, - {"github.com/openshift/api/machine/v1alpha1", "", "io.fabric8.openshift.api.model.machine.v1alpha1", "os_machine_v1alpha1_", true}, - {"github.com/openshift/api/machine/v1", "", "io.fabric8.openshift.api.model.machine.v1", "os_machine_v1_", true}, - } - - typeMap := map[reflect.Type]reflect.Type{ - reflect.TypeOf(time.Time{}): reflect.TypeOf(""), - reflect.TypeOf(struct{}{}): reflect.TypeOf(""), - } - manualTypeMap := map[reflect.Type]string{ - reflect.TypeOf(runtime.RawExtension{}): "java.util.Map", - } - schema, err := schemagen.GenerateSchema(reflect.TypeOf(Schema{}), packages, typeMap, manualTypeMap,"machine") - 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-machine/pom.xml b/kubernetes-model-generator/openshift-model-machine/pom.xml index ddd1d17afa2..63347252b9e 100644 --- a/kubernetes-model-generator/openshift-model-machine/pom.xml +++ b/kubernetes-model-generator/openshift-model-machine/pom.xml @@ -43,10 +43,6 @@ io.fabric8 kubernetes-model-core - - io.fabric8 - kubernetes-model-common - org.assertj assertj-core @@ -54,31 +50,31 @@ - - - - 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-machine.json + + + io.fabric8.kubernetes.api.model + io.fabric8.openshift.api.model.machine + io.fabric8.openshift.api.model.machine + + + ^io\.openshift\.machine\..*$ + ^com\.github\.openshift\.api\.machine\..*$ + + + diff --git a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java deleted file mode 100644 index 2e8bffd278f..00000000000 --- a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ /dev/null @@ -1,308 +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.machine.v1.ControlPlaneMachineSet; -import io.fabric8.openshift.api.model.machine.v1.ControlPlaneMachineSetList; -import io.fabric8.openshift.api.model.machine.v1.NutanixCategory; -import io.fabric8.openshift.api.model.machine.v1.NutanixResourceIdentifier; -import io.fabric8.openshift.api.model.machine.v1alpha1.OpenstackProviderSpec; -import io.fabric8.openshift.api.model.machine.v1alpha1.SubnetFilter; -import io.fabric8.openshift.api.model.machine.v1beta1.Machine; -import io.fabric8.openshift.api.model.machine.v1beta1.MachineHealthCheck; -import io.fabric8.openshift.api.model.machine.v1beta1.MachineHealthCheckList; -import io.fabric8.openshift.api.model.machine.v1beta1.MachineList; -import io.fabric8.openshift.api.model.machine.v1beta1.MachineSet; -import io.fabric8.openshift.api.model.machine.v1beta1.MachineSetList; - -@Generated("jsonschema2pojo") -public class KubeSchema { - - private APIGroup aPIGroup; - private APIGroupList aPIGroupList; - private KubernetesList baseKubernetesList; - private ControlPlaneMachineSet controlPlaneMachineSet; - private ControlPlaneMachineSetList controlPlaneMachineSetList; - private Info info; - private Machine machine; - private MachineHealthCheck machineHealthCheck; - private MachineHealthCheckList machineHealthCheckList; - private MachineList machineList; - private MachineSet machineSet; - private MachineSetList machineSetList; - private ObjectMeta objectMeta; - private Patch patch; - private Status status; - private String time; - private TypeMeta typeMeta; - private OpenstackProviderSpec v1Alpha1OpenStackProviderSpec; - private SubnetFilter v1Alpha1SubnetFilter; - private NutanixCategory v1NutanixCategory; - private NutanixResourceIdentifier v1NutanixResourceIdentifier; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public KubeSchema() { - } - - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, ControlPlaneMachineSet controlPlaneMachineSet, ControlPlaneMachineSetList controlPlaneMachineSetList, Info info, Machine machine, MachineHealthCheck machineHealthCheck, MachineHealthCheckList machineHealthCheckList, MachineList machineList, MachineSet machineSet, MachineSetList machineSetList, ObjectMeta objectMeta, Patch patch, Status status, String time, TypeMeta typeMeta, OpenstackProviderSpec v1Alpha1OpenStackProviderSpec, SubnetFilter v1Alpha1SubnetFilter, NutanixCategory v1NutanixCategory, NutanixResourceIdentifier v1NutanixResourceIdentifier) { - super(); - this.aPIGroup = aPIGroup; - this.aPIGroupList = aPIGroupList; - this.baseKubernetesList = baseKubernetesList; - this.controlPlaneMachineSet = controlPlaneMachineSet; - this.controlPlaneMachineSetList = controlPlaneMachineSetList; - this.info = info; - this.machine = machine; - this.machineHealthCheck = machineHealthCheck; - this.machineHealthCheckList = machineHealthCheckList; - this.machineList = machineList; - this.machineSet = machineSet; - this.machineSetList = machineSetList; - this.objectMeta = objectMeta; - this.patch = patch; - this.status = status; - this.time = time; - this.typeMeta = typeMeta; - this.v1Alpha1OpenStackProviderSpec = v1Alpha1OpenStackProviderSpec; - this.v1Alpha1SubnetFilter = v1Alpha1SubnetFilter; - this.v1NutanixCategory = v1NutanixCategory; - this.v1NutanixResourceIdentifier = v1NutanixResourceIdentifier; - } - - @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("BaseKubernetesList") - public KubernetesList getBaseKubernetesList() { - return baseKubernetesList; - } - - @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(KubernetesList baseKubernetesList) { - this.baseKubernetesList = baseKubernetesList; - } - - @JsonProperty("ControlPlaneMachineSet") - public ControlPlaneMachineSet getControlPlaneMachineSet() { - return controlPlaneMachineSet; - } - - @JsonProperty("ControlPlaneMachineSet") - public void setControlPlaneMachineSet(ControlPlaneMachineSet controlPlaneMachineSet) { - this.controlPlaneMachineSet = controlPlaneMachineSet; - } - - @JsonProperty("ControlPlaneMachineSetList") - public ControlPlaneMachineSetList getControlPlaneMachineSetList() { - return controlPlaneMachineSetList; - } - - @JsonProperty("ControlPlaneMachineSetList") - public void setControlPlaneMachineSetList(ControlPlaneMachineSetList controlPlaneMachineSetList) { - this.controlPlaneMachineSetList = controlPlaneMachineSetList; - } - - @JsonProperty("Info") - public Info getInfo() { - return info; - } - - @JsonProperty("Info") - public void setInfo(Info info) { - this.info = info; - } - - @JsonProperty("Machine") - public Machine getMachine() { - return machine; - } - - @JsonProperty("Machine") - public void setMachine(Machine machine) { - this.machine = machine; - } - - @JsonProperty("MachineHealthCheck") - public MachineHealthCheck getMachineHealthCheck() { - return machineHealthCheck; - } - - @JsonProperty("MachineHealthCheck") - public void setMachineHealthCheck(MachineHealthCheck machineHealthCheck) { - this.machineHealthCheck = machineHealthCheck; - } - - @JsonProperty("MachineHealthCheckList") - public MachineHealthCheckList getMachineHealthCheckList() { - return machineHealthCheckList; - } - - @JsonProperty("MachineHealthCheckList") - public void setMachineHealthCheckList(MachineHealthCheckList machineHealthCheckList) { - this.machineHealthCheckList = machineHealthCheckList; - } - - @JsonProperty("MachineList") - public MachineList getMachineList() { - return machineList; - } - - @JsonProperty("MachineList") - public void setMachineList(MachineList machineList) { - this.machineList = machineList; - } - - @JsonProperty("MachineSet") - public MachineSet getMachineSet() { - return machineSet; - } - - @JsonProperty("MachineSet") - public void setMachineSet(MachineSet machineSet) { - this.machineSet = machineSet; - } - - @JsonProperty("MachineSetList") - public MachineSetList getMachineSetList() { - return machineSetList; - } - - @JsonProperty("MachineSetList") - public void setMachineSetList(MachineSetList machineSetList) { - this.machineSetList = machineSetList; - } - - @JsonProperty("ObjectMeta") - public ObjectMeta getObjectMeta() { - return objectMeta; - } - - @JsonProperty("ObjectMeta") - public void setObjectMeta(ObjectMeta objectMeta) { - this.objectMeta = objectMeta; - } - - @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; - } - - @JsonProperty("V1Alpha1OpenStackProviderSpec") - public OpenstackProviderSpec getV1Alpha1OpenStackProviderSpec() { - return v1Alpha1OpenStackProviderSpec; - } - - @JsonProperty("V1Alpha1OpenStackProviderSpec") - public void setV1Alpha1OpenStackProviderSpec(OpenstackProviderSpec v1Alpha1OpenStackProviderSpec) { - this.v1Alpha1OpenStackProviderSpec = v1Alpha1OpenStackProviderSpec; - } - - @JsonProperty("V1Alpha1SubnetFilter") - public SubnetFilter getV1Alpha1SubnetFilter() { - return v1Alpha1SubnetFilter; - } - - @JsonProperty("V1Alpha1SubnetFilter") - public void setV1Alpha1SubnetFilter(SubnetFilter v1Alpha1SubnetFilter) { - this.v1Alpha1SubnetFilter = v1Alpha1SubnetFilter; - } - - @JsonProperty("V1NutanixCategory") - public NutanixCategory getV1NutanixCategory() { - return v1NutanixCategory; - } - - @JsonProperty("V1NutanixCategory") - public void setV1NutanixCategory(NutanixCategory v1NutanixCategory) { - this.v1NutanixCategory = v1NutanixCategory; - } - - @JsonProperty("V1NutanixResourceIdentifier") - public NutanixResourceIdentifier getV1NutanixResourceIdentifier() { - return v1NutanixResourceIdentifier; - } - - @JsonProperty("V1NutanixResourceIdentifier") - public void setV1NutanixResourceIdentifier(NutanixResourceIdentifier v1NutanixResourceIdentifier) { - this.v1NutanixResourceIdentifier = v1NutanixResourceIdentifier; - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @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-machine/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java deleted file mode 100644 index abed4bdef39..00000000000 --- a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ /dev/null @@ -1,308 +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.machine.v1.ControlPlaneMachineSet; -import io.fabric8.openshift.api.model.machine.v1.ControlPlaneMachineSetList; -import io.fabric8.openshift.api.model.machine.v1.NutanixCategory; -import io.fabric8.openshift.api.model.machine.v1.NutanixResourceIdentifier; -import io.fabric8.openshift.api.model.machine.v1alpha1.OpenstackProviderSpec; -import io.fabric8.openshift.api.model.machine.v1alpha1.SubnetFilter; -import io.fabric8.openshift.api.model.machine.v1beta1.Machine; -import io.fabric8.openshift.api.model.machine.v1beta1.MachineHealthCheck; -import io.fabric8.openshift.api.model.machine.v1beta1.MachineHealthCheckList; -import io.fabric8.openshift.api.model.machine.v1beta1.MachineList; -import io.fabric8.openshift.api.model.machine.v1beta1.MachineSet; -import io.fabric8.openshift.api.model.machine.v1beta1.MachineSetList; - -@Generated("jsonschema2pojo") -public class ValidationSchema { - - private APIGroup aPIGroup; - private APIGroupList aPIGroupList; - private KubernetesList baseKubernetesList; - private ControlPlaneMachineSet controlPlaneMachineSet; - private ControlPlaneMachineSetList controlPlaneMachineSetList; - private Info info; - private Machine machine; - private MachineHealthCheck machineHealthCheck; - private MachineHealthCheckList machineHealthCheckList; - private MachineList machineList; - private MachineSet machineSet; - private MachineSetList machineSetList; - private ObjectMeta objectMeta; - private Patch patch; - private Status status; - private String time; - private TypeMeta typeMeta; - private OpenstackProviderSpec v1Alpha1OpenStackProviderSpec; - private SubnetFilter v1Alpha1SubnetFilter; - private NutanixCategory v1NutanixCategory; - private NutanixResourceIdentifier v1NutanixResourceIdentifier; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ValidationSchema() { - } - - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, ControlPlaneMachineSet controlPlaneMachineSet, ControlPlaneMachineSetList controlPlaneMachineSetList, Info info, Machine machine, MachineHealthCheck machineHealthCheck, MachineHealthCheckList machineHealthCheckList, MachineList machineList, MachineSet machineSet, MachineSetList machineSetList, ObjectMeta objectMeta, Patch patch, Status status, String time, TypeMeta typeMeta, OpenstackProviderSpec v1Alpha1OpenStackProviderSpec, SubnetFilter v1Alpha1SubnetFilter, NutanixCategory v1NutanixCategory, NutanixResourceIdentifier v1NutanixResourceIdentifier) { - super(); - this.aPIGroup = aPIGroup; - this.aPIGroupList = aPIGroupList; - this.baseKubernetesList = baseKubernetesList; - this.controlPlaneMachineSet = controlPlaneMachineSet; - this.controlPlaneMachineSetList = controlPlaneMachineSetList; - this.info = info; - this.machine = machine; - this.machineHealthCheck = machineHealthCheck; - this.machineHealthCheckList = machineHealthCheckList; - this.machineList = machineList; - this.machineSet = machineSet; - this.machineSetList = machineSetList; - this.objectMeta = objectMeta; - this.patch = patch; - this.status = status; - this.time = time; - this.typeMeta = typeMeta; - this.v1Alpha1OpenStackProviderSpec = v1Alpha1OpenStackProviderSpec; - this.v1Alpha1SubnetFilter = v1Alpha1SubnetFilter; - this.v1NutanixCategory = v1NutanixCategory; - this.v1NutanixResourceIdentifier = v1NutanixResourceIdentifier; - } - - @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("BaseKubernetesList") - public KubernetesList getBaseKubernetesList() { - return baseKubernetesList; - } - - @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(KubernetesList baseKubernetesList) { - this.baseKubernetesList = baseKubernetesList; - } - - @JsonProperty("ControlPlaneMachineSet") - public ControlPlaneMachineSet getControlPlaneMachineSet() { - return controlPlaneMachineSet; - } - - @JsonProperty("ControlPlaneMachineSet") - public void setControlPlaneMachineSet(ControlPlaneMachineSet controlPlaneMachineSet) { - this.controlPlaneMachineSet = controlPlaneMachineSet; - } - - @JsonProperty("ControlPlaneMachineSetList") - public ControlPlaneMachineSetList getControlPlaneMachineSetList() { - return controlPlaneMachineSetList; - } - - @JsonProperty("ControlPlaneMachineSetList") - public void setControlPlaneMachineSetList(ControlPlaneMachineSetList controlPlaneMachineSetList) { - this.controlPlaneMachineSetList = controlPlaneMachineSetList; - } - - @JsonProperty("Info") - public Info getInfo() { - return info; - } - - @JsonProperty("Info") - public void setInfo(Info info) { - this.info = info; - } - - @JsonProperty("Machine") - public Machine getMachine() { - return machine; - } - - @JsonProperty("Machine") - public void setMachine(Machine machine) { - this.machine = machine; - } - - @JsonProperty("MachineHealthCheck") - public MachineHealthCheck getMachineHealthCheck() { - return machineHealthCheck; - } - - @JsonProperty("MachineHealthCheck") - public void setMachineHealthCheck(MachineHealthCheck machineHealthCheck) { - this.machineHealthCheck = machineHealthCheck; - } - - @JsonProperty("MachineHealthCheckList") - public MachineHealthCheckList getMachineHealthCheckList() { - return machineHealthCheckList; - } - - @JsonProperty("MachineHealthCheckList") - public void setMachineHealthCheckList(MachineHealthCheckList machineHealthCheckList) { - this.machineHealthCheckList = machineHealthCheckList; - } - - @JsonProperty("MachineList") - public MachineList getMachineList() { - return machineList; - } - - @JsonProperty("MachineList") - public void setMachineList(MachineList machineList) { - this.machineList = machineList; - } - - @JsonProperty("MachineSet") - public MachineSet getMachineSet() { - return machineSet; - } - - @JsonProperty("MachineSet") - public void setMachineSet(MachineSet machineSet) { - this.machineSet = machineSet; - } - - @JsonProperty("MachineSetList") - public MachineSetList getMachineSetList() { - return machineSetList; - } - - @JsonProperty("MachineSetList") - public void setMachineSetList(MachineSetList machineSetList) { - this.machineSetList = machineSetList; - } - - @JsonProperty("ObjectMeta") - public ObjectMeta getObjectMeta() { - return objectMeta; - } - - @JsonProperty("ObjectMeta") - public void setObjectMeta(ObjectMeta objectMeta) { - this.objectMeta = objectMeta; - } - - @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; - } - - @JsonProperty("V1Alpha1OpenStackProviderSpec") - public OpenstackProviderSpec getV1Alpha1OpenStackProviderSpec() { - return v1Alpha1OpenStackProviderSpec; - } - - @JsonProperty("V1Alpha1OpenStackProviderSpec") - public void setV1Alpha1OpenStackProviderSpec(OpenstackProviderSpec v1Alpha1OpenStackProviderSpec) { - this.v1Alpha1OpenStackProviderSpec = v1Alpha1OpenStackProviderSpec; - } - - @JsonProperty("V1Alpha1SubnetFilter") - public SubnetFilter getV1Alpha1SubnetFilter() { - return v1Alpha1SubnetFilter; - } - - @JsonProperty("V1Alpha1SubnetFilter") - public void setV1Alpha1SubnetFilter(SubnetFilter v1Alpha1SubnetFilter) { - this.v1Alpha1SubnetFilter = v1Alpha1SubnetFilter; - } - - @JsonProperty("V1NutanixCategory") - public NutanixCategory getV1NutanixCategory() { - return v1NutanixCategory; - } - - @JsonProperty("V1NutanixCategory") - public void setV1NutanixCategory(NutanixCategory v1NutanixCategory) { - this.v1NutanixCategory = v1NutanixCategory; - } - - @JsonProperty("V1NutanixResourceIdentifier") - public NutanixResourceIdentifier getV1NutanixResourceIdentifier() { - return v1NutanixResourceIdentifier; - } - - @JsonProperty("V1NutanixResourceIdentifier") - public void setV1NutanixResourceIdentifier(NutanixResourceIdentifier v1NutanixResourceIdentifier) { - this.v1NutanixResourceIdentifier = v1NutanixResourceIdentifier; - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @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-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSet.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSet.java index 0b23d4fae28..cda29a0930a 100644 --- a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSet.java +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSet.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 ControlPlaneMachineSet implements Editable additionalProperties = new LinkedHashMap(); @@ -77,7 +78,7 @@ public class ControlPlaneMachineSetSpec implements Editable , KubernetesResource +{ + + @JsonProperty("matchExpressions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List matchExpressions = new ArrayList<>(); + @JsonProperty("matchLabels") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private Map matchLabels = new LinkedHashMap<>(); + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ControlPlaneMachineSetSpecSelector() { + } + + public ControlPlaneMachineSetSpecSelector(List matchExpressions, Map matchLabels) { + super(); + this.matchExpressions = matchExpressions; + this.matchLabels = matchLabels; + } + + @JsonProperty("matchExpressions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getMatchExpressions() { + return matchExpressions; + } + + @JsonProperty("matchExpressions") + public void setMatchExpressions(List matchExpressions) { + this.matchExpressions = matchExpressions; + } + + @JsonProperty("matchLabels") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public Map getMatchLabels() { + return matchLabels; + } + + @JsonProperty("matchLabels") + public void setMatchLabels(Map matchLabels) { + this.matchLabels = matchLabels; + } + + @JsonIgnore + public ControlPlaneMachineSetSpecSelectorBuilder edit() { + return new ControlPlaneMachineSetSpecSelectorBuilder(this); + } + + @JsonIgnore + public ControlPlaneMachineSetSpecSelectorBuilder 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-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetStrategy.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecStrategy.java similarity index 87% rename from kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetStrategy.java rename to kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecStrategy.java index 520bae6f7fb..a1df59b86df 100644 --- a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetStrategy.java +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecStrategy.java @@ -51,7 +51,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ControlPlaneMachineSetStrategy implements Editable , KubernetesResource +public class ControlPlaneMachineSetSpecStrategy implements Editable , KubernetesResource { @JsonProperty("type") @@ -63,10 +63,10 @@ public class ControlPlaneMachineSetStrategy implements Editable , KubernetesResource +public class ControlPlaneMachineSetSpecTMFDAws implements Editable , KubernetesResource { @JsonProperty("placement") - private AWSFailureDomainPlacement placement; + private ControlPlaneMachineSetSpecTMFDAwsPlacement placement; @JsonProperty("subnet") - private AWSResourceReference subnet; + private ControlPlaneMachineSetSpecTMFDAwsSubnet subnet; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -66,42 +66,42 @@ public class AWSFailureDomain implements Editable , Kub * No args constructor for use in serialization * */ - public AWSFailureDomain() { + public ControlPlaneMachineSetSpecTMFDAws() { } - public AWSFailureDomain(AWSFailureDomainPlacement placement, AWSResourceReference subnet) { + public ControlPlaneMachineSetSpecTMFDAws(ControlPlaneMachineSetSpecTMFDAwsPlacement placement, ControlPlaneMachineSetSpecTMFDAwsSubnet subnet) { super(); this.placement = placement; this.subnet = subnet; } @JsonProperty("placement") - public AWSFailureDomainPlacement getPlacement() { + public ControlPlaneMachineSetSpecTMFDAwsPlacement getPlacement() { return placement; } @JsonProperty("placement") - public void setPlacement(AWSFailureDomainPlacement placement) { + public void setPlacement(ControlPlaneMachineSetSpecTMFDAwsPlacement placement) { this.placement = placement; } @JsonProperty("subnet") - public AWSResourceReference getSubnet() { + public ControlPlaneMachineSetSpecTMFDAwsSubnet getSubnet() { return subnet; } @JsonProperty("subnet") - public void setSubnet(AWSResourceReference subnet) { + public void setSubnet(ControlPlaneMachineSetSpecTMFDAwsSubnet subnet) { this.subnet = subnet; } @JsonIgnore - public AWSFailureDomainBuilder edit() { - return new AWSFailureDomainBuilder(this); + public ControlPlaneMachineSetSpecTMFDAwsBuilder edit() { + return new ControlPlaneMachineSetSpecTMFDAwsBuilder(this); } @JsonIgnore - public AWSFailureDomainBuilder toBuilder() { + public ControlPlaneMachineSetSpecTMFDAwsBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/RootVolume.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMFDAwsPlacement.java similarity index 87% rename from kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/RootVolume.java rename to kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMFDAwsPlacement.java index 0a8e09cff5f..070fd4b9a6c 100644 --- a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/RootVolume.java +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMFDAwsPlacement.java @@ -51,7 +51,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class RootVolume implements Editable , KubernetesResource +public class ControlPlaneMachineSetSpecTMFDAwsPlacement implements Editable , KubernetesResource { @JsonProperty("availabilityZone") @@ -63,10 +63,10 @@ public class RootVolume implements Editable , KubernetesResou * No args constructor for use in serialization * */ - public RootVolume() { + public ControlPlaneMachineSetSpecTMFDAwsPlacement() { } - public RootVolume(String availabilityZone) { + public ControlPlaneMachineSetSpecTMFDAwsPlacement(String availabilityZone) { super(); this.availabilityZone = availabilityZone; } @@ -82,12 +82,12 @@ public void setAvailabilityZone(String availabilityZone) { } @JsonIgnore - public RootVolumeBuilder edit() { - return new RootVolumeBuilder(this); + public ControlPlaneMachineSetSpecTMFDAwsPlacementBuilder edit() { + return new ControlPlaneMachineSetSpecTMFDAwsPlacementBuilder(this); } @JsonIgnore - public RootVolumeBuilder toBuilder() { + public ControlPlaneMachineSetSpecTMFDAwsPlacementBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/AWSResourceFilter.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMFDAwsSFilters.java similarity index 87% rename from kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/AWSResourceFilter.java rename to kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMFDAwsSFilters.java index aa7c2789832..65e179ef7d5 100644 --- a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/AWSResourceFilter.java +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMFDAwsSFilters.java @@ -54,7 +54,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class AWSResourceFilter implements Editable , KubernetesResource +public class ControlPlaneMachineSetSpecTMFDAwsSFilters implements Editable , KubernetesResource { @JsonProperty("name") @@ -69,10 +69,10 @@ public class AWSResourceFilter implements Editable , K * No args constructor for use in serialization * */ - public AWSResourceFilter() { + public ControlPlaneMachineSetSpecTMFDAwsSFilters() { } - public AWSResourceFilter(String name, List values) { + public ControlPlaneMachineSetSpecTMFDAwsSFilters(String name, List values) { super(); this.name = name; this.values = values; @@ -100,12 +100,12 @@ public void setValues(List values) { } @JsonIgnore - public AWSResourceFilterBuilder edit() { - return new AWSResourceFilterBuilder(this); + public ControlPlaneMachineSetSpecTMFDAwsSFiltersBuilder edit() { + return new ControlPlaneMachineSetSpecTMFDAwsSFiltersBuilder(this); } @JsonIgnore - public AWSResourceFilterBuilder toBuilder() { + public ControlPlaneMachineSetSpecTMFDAwsSFiltersBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/AWSResourceReference.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMFDAwsSubnet.java similarity index 83% rename from kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/AWSResourceReference.java rename to kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMFDAwsSubnet.java index c32ecca7105..9f49a886d8e 100644 --- a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/AWSResourceReference.java +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMFDAwsSubnet.java @@ -56,14 +56,14 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class AWSResourceReference implements Editable , KubernetesResource +public class ControlPlaneMachineSetSpecTMFDAwsSubnet implements Editable , KubernetesResource { @JsonProperty("arn") private String arn; @JsonProperty("filters") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List filters = new ArrayList<>(); + private List filters = new ArrayList<>(); @JsonProperty("id") private String id; @JsonProperty("type") @@ -75,10 +75,10 @@ public class AWSResourceReference implements Editable filters, String id, String type) { + public ControlPlaneMachineSetSpecTMFDAwsSubnet(String arn, List filters, String id, String type) { super(); this.arn = arn; this.filters = filters; @@ -98,12 +98,12 @@ public void setArn(String arn) { @JsonProperty("filters") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getFilters() { + public List getFilters() { return filters; } @JsonProperty("filters") - public void setFilters(List filters) { + public void setFilters(List filters) { this.filters = filters; } @@ -128,12 +128,12 @@ public void setType(String type) { } @JsonIgnore - public AWSResourceReferenceBuilder edit() { - return new AWSResourceReferenceBuilder(this); + public ControlPlaneMachineSetSpecTMFDAwsSubnetBuilder edit() { + return new ControlPlaneMachineSetSpecTMFDAwsSubnetBuilder(this); } @JsonIgnore - public AWSResourceReferenceBuilder toBuilder() { + public ControlPlaneMachineSetSpecTMFDAwsSubnetBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMFDAzure.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMFDAzure.java new file mode 100644 index 00000000000..3ad10e9d469 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMFDAzure.java @@ -0,0 +1,122 @@ + +package io.fabric8.openshift.api.model.machine.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({ + "subnet", + "zone" +}) +@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 ControlPlaneMachineSetSpecTMFDAzure implements Editable , KubernetesResource +{ + + @JsonProperty("subnet") + private String subnet; + @JsonProperty("zone") + private String zone; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ControlPlaneMachineSetSpecTMFDAzure() { + } + + public ControlPlaneMachineSetSpecTMFDAzure(String subnet, String zone) { + super(); + this.subnet = subnet; + this.zone = zone; + } + + @JsonProperty("subnet") + public String getSubnet() { + return subnet; + } + + @JsonProperty("subnet") + public void setSubnet(String subnet) { + this.subnet = subnet; + } + + @JsonProperty("zone") + public String getZone() { + return zone; + } + + @JsonProperty("zone") + public void setZone(String zone) { + this.zone = zone; + } + + @JsonIgnore + public ControlPlaneMachineSetSpecTMFDAzureBuilder edit() { + return new ControlPlaneMachineSetSpecTMFDAzureBuilder(this); + } + + @JsonIgnore + public ControlPlaneMachineSetSpecTMFDAzureBuilder 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-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/AzureFailureDomain.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMFDGcp.java similarity index 88% rename from kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/AzureFailureDomain.java rename to kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMFDGcp.java index 356ccf6ca89..0e38953de92 100644 --- a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/AzureFailureDomain.java +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMFDGcp.java @@ -51,7 +51,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class AzureFailureDomain implements Editable , KubernetesResource +public class ControlPlaneMachineSetSpecTMFDGcp implements Editable , KubernetesResource { @JsonProperty("zone") @@ -63,10 +63,10 @@ public class AzureFailureDomain implements Editable , * No args constructor for use in serialization * */ - public AzureFailureDomain() { + public ControlPlaneMachineSetSpecTMFDGcp() { } - public AzureFailureDomain(String zone) { + public ControlPlaneMachineSetSpecTMFDGcp(String zone) { super(); this.zone = zone; } @@ -82,12 +82,12 @@ public void setZone(String zone) { } @JsonIgnore - public AzureFailureDomainBuilder edit() { - return new AzureFailureDomainBuilder(this); + public ControlPlaneMachineSetSpecTMFDGcpBuilder edit() { + return new ControlPlaneMachineSetSpecTMFDGcpBuilder(this); } @JsonIgnore - public AzureFailureDomainBuilder toBuilder() { + public ControlPlaneMachineSetSpecTMFDGcpBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMFDNutanix.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMFDNutanix.java new file mode 100644 index 00000000000..9e1e973c228 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMFDNutanix.java @@ -0,0 +1,108 @@ + +package io.fabric8.openshift.api.model.machine.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({ + "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 ControlPlaneMachineSetSpecTMFDNutanix implements Editable , KubernetesResource +{ + + @JsonProperty("name") + private String name; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ControlPlaneMachineSetSpecTMFDNutanix() { + } + + public ControlPlaneMachineSetSpecTMFDNutanix(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 ControlPlaneMachineSetSpecTMFDNutanixBuilder edit() { + return new ControlPlaneMachineSetSpecTMFDNutanixBuilder(this); + } + + @JsonIgnore + public ControlPlaneMachineSetSpecTMFDNutanixBuilder 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-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/OpenStackFailureDomain.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMFDOpenstack.java similarity index 81% rename from kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/OpenStackFailureDomain.java rename to kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMFDOpenstack.java index 3e61a3ea801..fd7c3546589 100644 --- a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/OpenStackFailureDomain.java +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMFDOpenstack.java @@ -52,13 +52,13 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class OpenStackFailureDomain implements Editable , KubernetesResource +public class ControlPlaneMachineSetSpecTMFDOpenstack implements Editable , KubernetesResource { @JsonProperty("availabilityZone") private String availabilityZone; @JsonProperty("rootVolume") - private RootVolume rootVolume; + private ControlPlaneMachineSetSpecTMFDOpenstackRootVolume rootVolume; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -66,10 +66,10 @@ public class OpenStackFailureDomain implements Editable , KubernetesResource +{ + + @JsonProperty("availabilityZone") + private String availabilityZone; + @JsonProperty("volumeType") + private String volumeType; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ControlPlaneMachineSetSpecTMFDOpenstackRootVolume() { + } + + public ControlPlaneMachineSetSpecTMFDOpenstackRootVolume(String availabilityZone, String volumeType) { + super(); + this.availabilityZone = availabilityZone; + this.volumeType = volumeType; + } + + @JsonProperty("availabilityZone") + public String getAvailabilityZone() { + return availabilityZone; + } + + @JsonProperty("availabilityZone") + public void setAvailabilityZone(String availabilityZone) { + this.availabilityZone = availabilityZone; + } + + @JsonProperty("volumeType") + public String getVolumeType() { + return volumeType; + } + + @JsonProperty("volumeType") + public void setVolumeType(String volumeType) { + this.volumeType = volumeType; + } + + @JsonIgnore + public ControlPlaneMachineSetSpecTMFDOpenstackRootVolumeBuilder edit() { + return new ControlPlaneMachineSetSpecTMFDOpenstackRootVolumeBuilder(this); + } + + @JsonIgnore + public ControlPlaneMachineSetSpecTMFDOpenstackRootVolumeBuilder 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-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMFDVsphere.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMFDVsphere.java new file mode 100644 index 00000000000..a5485e31283 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMFDVsphere.java @@ -0,0 +1,108 @@ + +package io.fabric8.openshift.api.model.machine.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({ + "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 ControlPlaneMachineSetSpecTMFDVsphere implements Editable , KubernetesResource +{ + + @JsonProperty("name") + private String name; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ControlPlaneMachineSetSpecTMFDVsphere() { + } + + public ControlPlaneMachineSetSpecTMFDVsphere(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 ControlPlaneMachineSetSpecTMFDVsphereBuilder edit() { + return new ControlPlaneMachineSetSpecTMFDVsphereBuilder(this); + } + + @JsonIgnore + public ControlPlaneMachineSetSpecTMFDVsphereBuilder 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-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/FailureDomains.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMFailureDomains.java similarity index 61% rename from kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/FailureDomains.java rename to kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMFailureDomains.java index a88ce4ba01e..ae3e2bcbe9a 100644 --- a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/FailureDomains.java +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMFailureDomains.java @@ -36,8 +36,10 @@ "aws", "azure", "gcp", + "nutanix", "openstack", - "platform" + "platform", + "vsphere" }) @ToString @EqualsAndHashCode @@ -57,23 +59,29 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class FailureDomains implements Editable , KubernetesResource +public class ControlPlaneMachineSetSpecTMFailureDomains implements Editable , KubernetesResource { @JsonProperty("aws") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List aws = new ArrayList<>(); + private List aws = new ArrayList<>(); @JsonProperty("azure") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List azure = new ArrayList<>(); + private List azure = new ArrayList<>(); @JsonProperty("gcp") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List gcp = new ArrayList<>(); + private List gcp = new ArrayList<>(); + @JsonProperty("nutanix") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List nutanix = new ArrayList<>(); @JsonProperty("openstack") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List openstack = new ArrayList<>(); + private List openstack = new ArrayList<>(); @JsonProperty("platform") private String platform; + @JsonProperty("vsphere") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List vsphere = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -81,59 +89,72 @@ public class FailureDomains implements Editable , Kuberne * No args constructor for use in serialization * */ - public FailureDomains() { + public ControlPlaneMachineSetSpecTMFailureDomains() { } - public FailureDomains(List aws, List azure, List gcp, List openstack, String platform) { + public ControlPlaneMachineSetSpecTMFailureDomains(List aws, List azure, List gcp, List nutanix, List openstack, String platform, List vsphere) { super(); this.aws = aws; this.azure = azure; this.gcp = gcp; + this.nutanix = nutanix; this.openstack = openstack; this.platform = platform; + this.vsphere = vsphere; } @JsonProperty("aws") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getAws() { + public List getAws() { return aws; } @JsonProperty("aws") - public void setAws(List aws) { + public void setAws(List aws) { this.aws = aws; } @JsonProperty("azure") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getAzure() { + public List getAzure() { return azure; } @JsonProperty("azure") - public void setAzure(List azure) { + public void setAzure(List azure) { this.azure = azure; } @JsonProperty("gcp") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getGcp() { + public List getGcp() { return gcp; } @JsonProperty("gcp") - public void setGcp(List gcp) { + public void setGcp(List gcp) { this.gcp = gcp; } + @JsonProperty("nutanix") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getNutanix() { + return nutanix; + } + + @JsonProperty("nutanix") + public void setNutanix(List nutanix) { + this.nutanix = nutanix; + } + @JsonProperty("openstack") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getOpenstack() { + public List getOpenstack() { return openstack; } @JsonProperty("openstack") - public void setOpenstack(List openstack) { + public void setOpenstack(List openstack) { this.openstack = openstack; } @@ -147,13 +168,24 @@ public void setPlatform(String platform) { this.platform = platform; } + @JsonProperty("vsphere") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getVsphere() { + return vsphere; + } + + @JsonProperty("vsphere") + public void setVsphere(List vsphere) { + this.vsphere = vsphere; + } + @JsonIgnore - public FailureDomainsBuilder edit() { - return new FailureDomainsBuilder(this); + public ControlPlaneMachineSetSpecTMFailureDomainsBuilder edit() { + return new ControlPlaneMachineSetSpecTMFailureDomainsBuilder(this); } @JsonIgnore - public FailureDomainsBuilder toBuilder() { + public ControlPlaneMachineSetSpecTMFailureDomainsBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetTemplateObjectMeta.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMMetadata.java similarity index 88% rename from kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetTemplateObjectMeta.java rename to kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMMetadata.java index 324c8784330..2d8c163e029 100644 --- a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetTemplateObjectMeta.java +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMMetadata.java @@ -52,7 +52,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ControlPlaneMachineSetTemplateObjectMeta implements Editable , KubernetesResource +public class ControlPlaneMachineSetSpecTMMetadata implements Editable , KubernetesResource { @JsonProperty("annotations") @@ -68,10 +68,10 @@ public class ControlPlaneMachineSetTemplateObjectMeta implements Editable annotations, Map labels) { + public ControlPlaneMachineSetSpecTMMetadata(Map annotations, Map labels) { super(); this.annotations = annotations; this.labels = labels; @@ -100,12 +100,12 @@ public void setLabels(Map labels) { } @JsonIgnore - public ControlPlaneMachineSetTemplateObjectMetaBuilder edit() { - return new ControlPlaneMachineSetTemplateObjectMetaBuilder(this); + public ControlPlaneMachineSetSpecTMMetadataBuilder edit() { + return new ControlPlaneMachineSetSpecTMMetadataBuilder(this); } @JsonIgnore - public ControlPlaneMachineSetTemplateObjectMetaBuilder toBuilder() { + public ControlPlaneMachineSetSpecTMMetadataBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMSpec.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMSpec.java new file mode 100644 index 00000000000..02a95cf6f7b --- /dev/null +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMSpec.java @@ -0,0 +1,168 @@ + +package io.fabric8.openshift.api.model.machine.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({ + "metadata", + "lifecycleHooks", + "providerID", + "providerSpec", + "taints" +}) +@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 ControlPlaneMachineSetSpecTMSpec implements Editable , KubernetesResource +{ + + @JsonProperty("lifecycleHooks") + private ControlPlaneMachineSetSpecTMSpecLifecycleHooks lifecycleHooks; + @JsonProperty("metadata") + private ControlPlaneMachineSetSpecTMSpecMetadata metadata; + @JsonProperty("providerID") + private String providerID; + @JsonProperty("providerSpec") + private ControlPlaneMachineSetSpecTMSpecProviderSpec providerSpec; + @JsonProperty("taints") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List taints = new ArrayList<>(); + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ControlPlaneMachineSetSpecTMSpec() { + } + + public ControlPlaneMachineSetSpecTMSpec(ControlPlaneMachineSetSpecTMSpecLifecycleHooks lifecycleHooks, ControlPlaneMachineSetSpecTMSpecMetadata metadata, String providerID, ControlPlaneMachineSetSpecTMSpecProviderSpec providerSpec, List taints) { + super(); + this.lifecycleHooks = lifecycleHooks; + this.metadata = metadata; + this.providerID = providerID; + this.providerSpec = providerSpec; + this.taints = taints; + } + + @JsonProperty("lifecycleHooks") + public ControlPlaneMachineSetSpecTMSpecLifecycleHooks getLifecycleHooks() { + return lifecycleHooks; + } + + @JsonProperty("lifecycleHooks") + public void setLifecycleHooks(ControlPlaneMachineSetSpecTMSpecLifecycleHooks lifecycleHooks) { + this.lifecycleHooks = lifecycleHooks; + } + + @JsonProperty("metadata") + public ControlPlaneMachineSetSpecTMSpecMetadata getMetadata() { + return metadata; + } + + @JsonProperty("metadata") + public void setMetadata(ControlPlaneMachineSetSpecTMSpecMetadata metadata) { + this.metadata = metadata; + } + + @JsonProperty("providerID") + public String getProviderID() { + return providerID; + } + + @JsonProperty("providerID") + public void setProviderID(String providerID) { + this.providerID = providerID; + } + + @JsonProperty("providerSpec") + public ControlPlaneMachineSetSpecTMSpecProviderSpec getProviderSpec() { + return providerSpec; + } + + @JsonProperty("providerSpec") + public void setProviderSpec(ControlPlaneMachineSetSpecTMSpecProviderSpec providerSpec) { + this.providerSpec = providerSpec; + } + + @JsonProperty("taints") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getTaints() { + return taints; + } + + @JsonProperty("taints") + public void setTaints(List taints) { + this.taints = taints; + } + + @JsonIgnore + public ControlPlaneMachineSetSpecTMSpecBuilder edit() { + return new ControlPlaneMachineSetSpecTMSpecBuilder(this); + } + + @JsonIgnore + public ControlPlaneMachineSetSpecTMSpecBuilder 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-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMSpecLHPreDrain.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMSpecLHPreDrain.java new file mode 100644 index 00000000000..f103847d3c6 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMSpecLHPreDrain.java @@ -0,0 +1,122 @@ + +package io.fabric8.openshift.api.model.machine.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({ + "name", + "owner" +}) +@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 ControlPlaneMachineSetSpecTMSpecLHPreDrain implements Editable , KubernetesResource +{ + + @JsonProperty("name") + private String name; + @JsonProperty("owner") + private String owner; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ControlPlaneMachineSetSpecTMSpecLHPreDrain() { + } + + public ControlPlaneMachineSetSpecTMSpecLHPreDrain(String name, String owner) { + super(); + this.name = name; + this.owner = owner; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonProperty("owner") + public String getOwner() { + return owner; + } + + @JsonProperty("owner") + public void setOwner(String owner) { + this.owner = owner; + } + + @JsonIgnore + public ControlPlaneMachineSetSpecTMSpecLHPreDrainBuilder edit() { + return new ControlPlaneMachineSetSpecTMSpecLHPreDrainBuilder(this); + } + + @JsonIgnore + public ControlPlaneMachineSetSpecTMSpecLHPreDrainBuilder 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-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMSpecLHPreTerminate.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMSpecLHPreTerminate.java new file mode 100644 index 00000000000..168c0c1f2a7 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMSpecLHPreTerminate.java @@ -0,0 +1,122 @@ + +package io.fabric8.openshift.api.model.machine.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({ + "name", + "owner" +}) +@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 ControlPlaneMachineSetSpecTMSpecLHPreTerminate implements Editable , KubernetesResource +{ + + @JsonProperty("name") + private String name; + @JsonProperty("owner") + private String owner; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ControlPlaneMachineSetSpecTMSpecLHPreTerminate() { + } + + public ControlPlaneMachineSetSpecTMSpecLHPreTerminate(String name, String owner) { + super(); + this.name = name; + this.owner = owner; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonProperty("owner") + public String getOwner() { + return owner; + } + + @JsonProperty("owner") + public void setOwner(String owner) { + this.owner = owner; + } + + @JsonIgnore + public ControlPlaneMachineSetSpecTMSpecLHPreTerminateBuilder edit() { + return new ControlPlaneMachineSetSpecTMSpecLHPreTerminateBuilder(this); + } + + @JsonIgnore + public ControlPlaneMachineSetSpecTMSpecLHPreTerminateBuilder 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-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMSpecLifecycleHooks.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMSpecLifecycleHooks.java new file mode 100644 index 00000000000..6c79288e539 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMSpecLifecycleHooks.java @@ -0,0 +1,128 @@ + +package io.fabric8.openshift.api.model.machine.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({ + "preDrain", + "preTerminate" +}) +@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 ControlPlaneMachineSetSpecTMSpecLifecycleHooks implements Editable , KubernetesResource +{ + + @JsonProperty("preDrain") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List preDrain = new ArrayList<>(); + @JsonProperty("preTerminate") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List preTerminate = new ArrayList<>(); + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ControlPlaneMachineSetSpecTMSpecLifecycleHooks() { + } + + public ControlPlaneMachineSetSpecTMSpecLifecycleHooks(List preDrain, List preTerminate) { + super(); + this.preDrain = preDrain; + this.preTerminate = preTerminate; + } + + @JsonProperty("preDrain") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getPreDrain() { + return preDrain; + } + + @JsonProperty("preDrain") + public void setPreDrain(List preDrain) { + this.preDrain = preDrain; + } + + @JsonProperty("preTerminate") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getPreTerminate() { + return preTerminate; + } + + @JsonProperty("preTerminate") + public void setPreTerminate(List preTerminate) { + this.preTerminate = preTerminate; + } + + @JsonIgnore + public ControlPlaneMachineSetSpecTMSpecLifecycleHooksBuilder edit() { + return new ControlPlaneMachineSetSpecTMSpecLifecycleHooksBuilder(this); + } + + @JsonIgnore + public ControlPlaneMachineSetSpecTMSpecLifecycleHooksBuilder 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-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMSpecMOwnerReferences.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMSpecMOwnerReferences.java new file mode 100644 index 00000000000..3019a94a192 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMSpecMOwnerReferences.java @@ -0,0 +1,178 @@ + +package io.fabric8.openshift.api.model.machine.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", + "blockOwnerDeletion", + "controller", + "name", + "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 ControlPlaneMachineSetSpecTMSpecMOwnerReferences implements Editable , KubernetesResource +{ + + @JsonProperty("apiVersion") + private String apiVersion; + @JsonProperty("blockOwnerDeletion") + private Boolean blockOwnerDeletion; + @JsonProperty("controller") + private Boolean controller; + @JsonProperty("kind") + private String kind; + @JsonProperty("name") + private String name; + @JsonProperty("uid") + private String uid; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ControlPlaneMachineSetSpecTMSpecMOwnerReferences() { + } + + public ControlPlaneMachineSetSpecTMSpecMOwnerReferences(String apiVersion, Boolean blockOwnerDeletion, Boolean controller, String kind, String name, String uid) { + super(); + this.apiVersion = apiVersion; + this.blockOwnerDeletion = blockOwnerDeletion; + this.controller = controller; + this.kind = kind; + this.name = name; + this.uid = uid; + } + + @JsonProperty("apiVersion") + public String getApiVersion() { + return apiVersion; + } + + @JsonProperty("apiVersion") + public void setApiVersion(String apiVersion) { + this.apiVersion = apiVersion; + } + + @JsonProperty("blockOwnerDeletion") + public Boolean getBlockOwnerDeletion() { + return blockOwnerDeletion; + } + + @JsonProperty("blockOwnerDeletion") + public void setBlockOwnerDeletion(Boolean blockOwnerDeletion) { + this.blockOwnerDeletion = blockOwnerDeletion; + } + + @JsonProperty("controller") + public Boolean getController() { + return controller; + } + + @JsonProperty("controller") + public void setController(Boolean controller) { + this.controller = controller; + } + + @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("uid") + public String getUid() { + return uid; + } + + @JsonProperty("uid") + public void setUid(String uid) { + this.uid = uid; + } + + @JsonIgnore + public ControlPlaneMachineSetSpecTMSpecMOwnerReferencesBuilder edit() { + return new ControlPlaneMachineSetSpecTMSpecMOwnerReferencesBuilder(this); + } + + @JsonIgnore + public ControlPlaneMachineSetSpecTMSpecMOwnerReferencesBuilder 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-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMSpecMetadata.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMSpecMetadata.java new file mode 100644 index 00000000000..aa7ea191881 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMSpecMetadata.java @@ -0,0 +1,186 @@ + +package io.fabric8.openshift.api.model.machine.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({ + "annotations", + "generateName", + "labels", + "name", + "namespace", + "ownerReferences" +}) +@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 ControlPlaneMachineSetSpecTMSpecMetadata implements Editable , KubernetesResource +{ + + @JsonProperty("annotations") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private Map annotations = new LinkedHashMap<>(); + @JsonProperty("generateName") + private String generateName; + @JsonProperty("labels") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private Map labels = new LinkedHashMap<>(); + @JsonProperty("name") + private String name; + @JsonProperty("namespace") + private String namespace; + @JsonProperty("ownerReferences") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List ownerReferences = new ArrayList<>(); + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ControlPlaneMachineSetSpecTMSpecMetadata() { + } + + public ControlPlaneMachineSetSpecTMSpecMetadata(Map annotations, String generateName, Map labels, String name, String namespace, List ownerReferences) { + super(); + this.annotations = annotations; + this.generateName = generateName; + this.labels = labels; + this.name = name; + this.namespace = namespace; + this.ownerReferences = ownerReferences; + } + + @JsonProperty("annotations") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public Map getAnnotations() { + return annotations; + } + + @JsonProperty("annotations") + public void setAnnotations(Map annotations) { + this.annotations = annotations; + } + + @JsonProperty("generateName") + public String getGenerateName() { + return generateName; + } + + @JsonProperty("generateName") + public void setGenerateName(String generateName) { + this.generateName = generateName; + } + + @JsonProperty("labels") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public Map getLabels() { + return labels; + } + + @JsonProperty("labels") + public void setLabels(Map labels) { + this.labels = labels; + } + + @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("ownerReferences") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getOwnerReferences() { + return ownerReferences; + } + + @JsonProperty("ownerReferences") + public void setOwnerReferences(List ownerReferences) { + this.ownerReferences = ownerReferences; + } + + @JsonIgnore + public ControlPlaneMachineSetSpecTMSpecMetadataBuilder edit() { + return new ControlPlaneMachineSetSpecTMSpecMetadataBuilder(this); + } + + @JsonIgnore + public ControlPlaneMachineSetSpecTMSpecMetadataBuilder 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-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMSpecProviderSpec.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMSpecProviderSpec.java new file mode 100644 index 00000000000..1594525b011 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMSpecProviderSpec.java @@ -0,0 +1,110 @@ + +package io.fabric8.openshift.api.model.machine.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({ + "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 ControlPlaneMachineSetSpecTMSpecProviderSpec implements Editable , KubernetesResource +{ + + @JsonProperty("value") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + private Object value; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ControlPlaneMachineSetSpecTMSpecProviderSpec() { + } + + public ControlPlaneMachineSetSpecTMSpecProviderSpec(Object value) { + super(); + this.value = value; + } + + @JsonProperty("value") + public Object getValue() { + return value; + } + + @JsonProperty("value") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + public void setValue(Object value) { + this.value = value; + } + + @JsonIgnore + public ControlPlaneMachineSetSpecTMSpecProviderSpecBuilder edit() { + return new ControlPlaneMachineSetSpecTMSpecProviderSpecBuilder(this); + } + + @JsonIgnore + public ControlPlaneMachineSetSpecTMSpecProviderSpecBuilder 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-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMSpecTaints.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMSpecTaints.java new file mode 100644 index 00000000000..71390ed6aab --- /dev/null +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMSpecTaints.java @@ -0,0 +1,150 @@ + +package io.fabric8.openshift.api.model.machine.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({ + "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 ControlPlaneMachineSetSpecTMSpecTaints 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 ControlPlaneMachineSetSpecTMSpecTaints() { + } + + public ControlPlaneMachineSetSpecTMSpecTaints(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 ControlPlaneMachineSetSpecTMSpecTaintsBuilder edit() { + return new ControlPlaneMachineSetSpecTMSpecTaintsBuilder(this); + } + + @JsonIgnore + public ControlPlaneMachineSetSpecTMSpecTaintsBuilder 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-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/OpenShiftMachineV1Beta1MachineTemplate.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMachines_v1beta1_machine_openshift_io.java similarity index 72% rename from kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/OpenShiftMachineV1Beta1MachineTemplate.java rename to kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMachines_v1beta1_machine_openshift_io.java index ba481a77abe..2e5606d9a4e 100644 --- a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/OpenShiftMachineV1Beta1MachineTemplate.java +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetSpecTMachines_v1beta1_machine_openshift_io.java @@ -22,7 +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.machine.v1beta1.MachineSpec; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; import lombok.EqualsAndHashCode; @@ -54,15 +53,15 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class OpenShiftMachineV1Beta1MachineTemplate implements Editable , KubernetesResource +public class ControlPlaneMachineSetSpecTMachines_v1beta1_machine_openshift_io implements Editable , KubernetesResource { @JsonProperty("failureDomains") - private FailureDomains failureDomains; + private ControlPlaneMachineSetSpecTMFailureDomains failureDomains; @JsonProperty("metadata") - private ControlPlaneMachineSetTemplateObjectMeta metadata; + private ControlPlaneMachineSetSpecTMMetadata metadata; @JsonProperty("spec") - private MachineSpec spec; + private ControlPlaneMachineSetSpecTMSpec spec; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -70,10 +69,10 @@ public class OpenShiftMachineV1Beta1MachineTemplate implements Editable , KubernetesResource +public class ControlPlaneMachineSetSpecTemplate implements Editable , KubernetesResource { @JsonProperty("machineType") private String machineType; @JsonProperty("machines_v1beta1_machine_openshift_io") - private OpenShiftMachineV1Beta1MachineTemplate machinesV1beta1MachineOpenshiftIo; + private ControlPlaneMachineSetSpecTMachines_v1beta1_machine_openshift_io machines_v1beta1_machine_openshift_io; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -66,13 +66,13 @@ public class ControlPlaneMachineSetTemplate implements Editable conditions = new ArrayList<>(); + private List conditions = new ArrayList<>(); @JsonProperty("observedGeneration") private Long observedGeneration; @JsonProperty("readyReplicas") @@ -85,7 +84,7 @@ public class ControlPlaneMachineSetStatus implements Editable conditions, Long observedGeneration, Integer readyReplicas, Integer replicas, Integer unavailableReplicas, Integer updatedReplicas) { + public ControlPlaneMachineSetStatus(List conditions, Long observedGeneration, Integer readyReplicas, Integer replicas, Integer unavailableReplicas, Integer updatedReplicas) { super(); this.conditions = conditions; this.observedGeneration = observedGeneration; @@ -97,12 +96,12 @@ public ControlPlaneMachineSetStatus(List conditions, Long observedGen @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-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetStatusConditions.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetStatusConditions.java new file mode 100644 index 00000000000..f0b35e603da --- /dev/null +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetStatusConditions.java @@ -0,0 +1,178 @@ + +package io.fabric8.openshift.api.model.machine.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 ControlPlaneMachineSetStatusConditions 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 ControlPlaneMachineSetStatusConditions() { + } + + public ControlPlaneMachineSetStatusConditions(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 ControlPlaneMachineSetStatusConditionsBuilder edit() { + return new ControlPlaneMachineSetStatusConditionsBuilder(this); + } + + @JsonIgnore + public ControlPlaneMachineSetStatusConditionsBuilder 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-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/LoadBalancerReference.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/LoadBalancerReference.java new file mode 100644 index 00000000000..c8aade91c54 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/LoadBalancerReference.java @@ -0,0 +1,122 @@ + +package io.fabric8.openshift.api.model.machine.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({ + "name", + "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 LoadBalancerReference implements Editable , KubernetesResource +{ + + @JsonProperty("name") + private String name; + @JsonProperty("type") + private String type; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public LoadBalancerReference() { + } + + public LoadBalancerReference(String name, String type) { + super(); + this.name = name; + this.type = type; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonProperty("type") + public String getType() { + return type; + } + + @JsonProperty("type") + public void setType(String type) { + this.type = type; + } + + @JsonIgnore + public LoadBalancerReferenceBuilder edit() { + return new LoadBalancerReferenceBuilder(this); + } + + @JsonIgnore + public LoadBalancerReferenceBuilder 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-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/NutanixFailureDomainReference.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/NutanixFailureDomainReference.java new file mode 100644 index 00000000000..0077cbfd3dc --- /dev/null +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/NutanixFailureDomainReference.java @@ -0,0 +1,108 @@ + +package io.fabric8.openshift.api.model.machine.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({ + "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 NutanixFailureDomainReference implements Editable , KubernetesResource +{ + + @JsonProperty("name") + private String name; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public NutanixFailureDomainReference() { + } + + public NutanixFailureDomainReference(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 NutanixFailureDomainReferenceBuilder edit() { + return new NutanixFailureDomainReferenceBuilder(this); + } + + @JsonIgnore + public NutanixFailureDomainReferenceBuilder 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-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/NutanixGPU.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/NutanixGPU.java new file mode 100644 index 00000000000..35116359997 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/NutanixGPU.java @@ -0,0 +1,136 @@ + +package io.fabric8.openshift.api.model.machine.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({ + "deviceID", + "name", + "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 NutanixGPU implements Editable , KubernetesResource +{ + + @JsonProperty("deviceID") + private Integer deviceID; + @JsonProperty("name") + private String name; + @JsonProperty("type") + private String type; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public NutanixGPU() { + } + + public NutanixGPU(Integer deviceID, String name, String type) { + super(); + this.deviceID = deviceID; + this.name = name; + this.type = type; + } + + @JsonProperty("deviceID") + public Integer getDeviceID() { + return deviceID; + } + + @JsonProperty("deviceID") + public void setDeviceID(Integer deviceID) { + this.deviceID = deviceID; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonProperty("type") + public String getType() { + return type; + } + + @JsonProperty("type") + public void setType(String type) { + this.type = type; + } + + @JsonIgnore + public NutanixGPUBuilder edit() { + return new NutanixGPUBuilder(this); + } + + @JsonIgnore + public NutanixGPUBuilder 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-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/NutanixMachineProviderConfig.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/NutanixMachineProviderConfig.java new file mode 100644 index 00000000000..f554d482033 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/NutanixMachineProviderConfig.java @@ -0,0 +1,397 @@ + +package io.fabric8.openshift.api.model.machine.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.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.Quantity; +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", + "bootType", + "categories", + "cluster", + "credentialsSecret", + "dataDisks", + "failureDomain", + "gpus", + "image", + "memorySize", + "project", + "subnets", + "systemDiskSize", + "userDataSecret", + "vcpuSockets", + "vcpusPerSocket" +}) +@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("machine.openshift.io") +@Generated("jsonschema2pojo") +public class NutanixMachineProviderConfig implements Editable , HasMetadata, Namespaced +{ + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + private String apiVersion = "machine.openshift.io/v1"; + @JsonProperty("bootType") + private String bootType; + @JsonProperty("categories") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List categories = new ArrayList<>(); + @JsonProperty("cluster") + private NutanixResourceIdentifier cluster; + @JsonProperty("credentialsSecret") + private LocalObjectReference credentialsSecret; + @JsonProperty("dataDisks") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List dataDisks = new ArrayList<>(); + @JsonProperty("failureDomain") + private NutanixFailureDomainReference failureDomain; + @JsonProperty("gpus") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List gpus = new ArrayList<>(); + @JsonProperty("image") + private NutanixResourceIdentifier image; + /** + * + * (Required) + * + */ + @JsonProperty("kind") + private String kind = "NutanixMachineProviderConfig"; + @JsonProperty("memorySize") + private Quantity memorySize; + @JsonProperty("metadata") + private ObjectMeta metadata; + @JsonProperty("project") + private NutanixResourceIdentifier project; + @JsonProperty("subnets") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List subnets = new ArrayList<>(); + @JsonProperty("systemDiskSize") + private Quantity systemDiskSize; + @JsonProperty("userDataSecret") + private LocalObjectReference userDataSecret; + @JsonProperty("vcpuSockets") + private Integer vcpuSockets; + @JsonProperty("vcpusPerSocket") + private Integer vcpusPerSocket; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public NutanixMachineProviderConfig() { + } + + public NutanixMachineProviderConfig(String apiVersion, String bootType, List categories, NutanixResourceIdentifier cluster, LocalObjectReference credentialsSecret, List dataDisks, NutanixFailureDomainReference failureDomain, List gpus, NutanixResourceIdentifier image, String kind, Quantity memorySize, ObjectMeta metadata, NutanixResourceIdentifier project, List subnets, Quantity systemDiskSize, LocalObjectReference userDataSecret, Integer vcpuSockets, Integer vcpusPerSocket) { + super(); + this.apiVersion = apiVersion; + this.bootType = bootType; + this.categories = categories; + this.cluster = cluster; + this.credentialsSecret = credentialsSecret; + this.dataDisks = dataDisks; + this.failureDomain = failureDomain; + this.gpus = gpus; + this.image = image; + this.kind = kind; + this.memorySize = memorySize; + this.metadata = metadata; + this.project = project; + this.subnets = subnets; + this.systemDiskSize = systemDiskSize; + this.userDataSecret = userDataSecret; + this.vcpuSockets = vcpuSockets; + this.vcpusPerSocket = vcpusPerSocket; + } + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + public String getApiVersion() { + return apiVersion; + } + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + public void setApiVersion(String apiVersion) { + this.apiVersion = apiVersion; + } + + @JsonProperty("bootType") + public String getBootType() { + return bootType; + } + + @JsonProperty("bootType") + public void setBootType(String bootType) { + this.bootType = bootType; + } + + @JsonProperty("categories") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getCategories() { + return categories; + } + + @JsonProperty("categories") + public void setCategories(List categories) { + this.categories = categories; + } + + @JsonProperty("cluster") + public NutanixResourceIdentifier getCluster() { + return cluster; + } + + @JsonProperty("cluster") + public void setCluster(NutanixResourceIdentifier cluster) { + this.cluster = cluster; + } + + @JsonProperty("credentialsSecret") + public LocalObjectReference getCredentialsSecret() { + return credentialsSecret; + } + + @JsonProperty("credentialsSecret") + public void setCredentialsSecret(LocalObjectReference credentialsSecret) { + this.credentialsSecret = credentialsSecret; + } + + @JsonProperty("dataDisks") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getDataDisks() { + return dataDisks; + } + + @JsonProperty("dataDisks") + public void setDataDisks(List dataDisks) { + this.dataDisks = dataDisks; + } + + @JsonProperty("failureDomain") + public NutanixFailureDomainReference getFailureDomain() { + return failureDomain; + } + + @JsonProperty("failureDomain") + public void setFailureDomain(NutanixFailureDomainReference failureDomain) { + this.failureDomain = failureDomain; + } + + @JsonProperty("gpus") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getGpus() { + return gpus; + } + + @JsonProperty("gpus") + public void setGpus(List gpus) { + this.gpus = gpus; + } + + @JsonProperty("image") + public NutanixResourceIdentifier getImage() { + return image; + } + + @JsonProperty("image") + public void setImage(NutanixResourceIdentifier image) { + this.image = image; + } + + /** + * + * (Required) + * + */ + @JsonProperty("kind") + public String getKind() { + return kind; + } + + /** + * + * (Required) + * + */ + @JsonProperty("kind") + public void setKind(String kind) { + this.kind = kind; + } + + @JsonProperty("memorySize") + public Quantity getMemorySize() { + return memorySize; + } + + @JsonProperty("memorySize") + public void setMemorySize(Quantity memorySize) { + this.memorySize = memorySize; + } + + @JsonProperty("metadata") + public ObjectMeta getMetadata() { + return metadata; + } + + @JsonProperty("metadata") + public void setMetadata(ObjectMeta metadata) { + this.metadata = metadata; + } + + @JsonProperty("project") + public NutanixResourceIdentifier getProject() { + return project; + } + + @JsonProperty("project") + public void setProject(NutanixResourceIdentifier project) { + this.project = project; + } + + @JsonProperty("subnets") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getSubnets() { + return subnets; + } + + @JsonProperty("subnets") + public void setSubnets(List subnets) { + this.subnets = subnets; + } + + @JsonProperty("systemDiskSize") + public Quantity getSystemDiskSize() { + return systemDiskSize; + } + + @JsonProperty("systemDiskSize") + public void setSystemDiskSize(Quantity systemDiskSize) { + this.systemDiskSize = systemDiskSize; + } + + @JsonProperty("userDataSecret") + public LocalObjectReference getUserDataSecret() { + return userDataSecret; + } + + @JsonProperty("userDataSecret") + public void setUserDataSecret(LocalObjectReference userDataSecret) { + this.userDataSecret = userDataSecret; + } + + @JsonProperty("vcpuSockets") + public Integer getVcpuSockets() { + return vcpuSockets; + } + + @JsonProperty("vcpuSockets") + public void setVcpuSockets(Integer vcpuSockets) { + this.vcpuSockets = vcpuSockets; + } + + @JsonProperty("vcpusPerSocket") + public Integer getVcpusPerSocket() { + return vcpusPerSocket; + } + + @JsonProperty("vcpusPerSocket") + public void setVcpusPerSocket(Integer vcpusPerSocket) { + this.vcpusPerSocket = vcpusPerSocket; + } + + @JsonIgnore + public NutanixMachineProviderConfigBuilder edit() { + return new NutanixMachineProviderConfigBuilder(this); + } + + @JsonIgnore + public NutanixMachineProviderConfigBuilder 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-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/NutanixStorageResourceIdentifier.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/NutanixStorageResourceIdentifier.java new file mode 100644 index 00000000000..e17238f7ea5 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/NutanixStorageResourceIdentifier.java @@ -0,0 +1,122 @@ + +package io.fabric8.openshift.api.model.machine.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({ + "type", + "uuid" +}) +@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 NutanixStorageResourceIdentifier implements Editable , KubernetesResource +{ + + @JsonProperty("type") + private String type; + @JsonProperty("uuid") + private String uuid; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public NutanixStorageResourceIdentifier() { + } + + public NutanixStorageResourceIdentifier(String type, String uuid) { + super(); + this.type = type; + this.uuid = uuid; + } + + @JsonProperty("type") + public String getType() { + return type; + } + + @JsonProperty("type") + public void setType(String type) { + this.type = type; + } + + @JsonProperty("uuid") + public String getUuid() { + return uuid; + } + + @JsonProperty("uuid") + public void setUuid(String uuid) { + this.uuid = uuid; + } + + @JsonIgnore + public NutanixStorageResourceIdentifierBuilder edit() { + return new NutanixStorageResourceIdentifierBuilder(this); + } + + @JsonIgnore + public NutanixStorageResourceIdentifierBuilder 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-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/NutanixVMDisk.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/NutanixVMDisk.java new file mode 100644 index 00000000000..8d9de761d83 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/NutanixVMDisk.java @@ -0,0 +1,151 @@ + +package io.fabric8.openshift.api.model.machine.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.Quantity; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "dataSource", + "deviceProperties", + "diskSize", + "storageConfig" +}) +@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 NutanixVMDisk implements Editable , KubernetesResource +{ + + @JsonProperty("dataSource") + private NutanixResourceIdentifier dataSource; + @JsonProperty("deviceProperties") + private NutanixVMDiskDeviceProperties deviceProperties; + @JsonProperty("diskSize") + private Quantity diskSize; + @JsonProperty("storageConfig") + private NutanixVMStorageConfig storageConfig; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public NutanixVMDisk() { + } + + public NutanixVMDisk(NutanixResourceIdentifier dataSource, NutanixVMDiskDeviceProperties deviceProperties, Quantity diskSize, NutanixVMStorageConfig storageConfig) { + super(); + this.dataSource = dataSource; + this.deviceProperties = deviceProperties; + this.diskSize = diskSize; + this.storageConfig = storageConfig; + } + + @JsonProperty("dataSource") + public NutanixResourceIdentifier getDataSource() { + return dataSource; + } + + @JsonProperty("dataSource") + public void setDataSource(NutanixResourceIdentifier dataSource) { + this.dataSource = dataSource; + } + + @JsonProperty("deviceProperties") + public NutanixVMDiskDeviceProperties getDeviceProperties() { + return deviceProperties; + } + + @JsonProperty("deviceProperties") + public void setDeviceProperties(NutanixVMDiskDeviceProperties deviceProperties) { + this.deviceProperties = deviceProperties; + } + + @JsonProperty("diskSize") + public Quantity getDiskSize() { + return diskSize; + } + + @JsonProperty("diskSize") + public void setDiskSize(Quantity diskSize) { + this.diskSize = diskSize; + } + + @JsonProperty("storageConfig") + public NutanixVMStorageConfig getStorageConfig() { + return storageConfig; + } + + @JsonProperty("storageConfig") + public void setStorageConfig(NutanixVMStorageConfig storageConfig) { + this.storageConfig = storageConfig; + } + + @JsonIgnore + public NutanixVMDiskBuilder edit() { + return new NutanixVMDiskBuilder(this); + } + + @JsonIgnore + public NutanixVMDiskBuilder 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-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/NutanixVMDiskDeviceProperties.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/NutanixVMDiskDeviceProperties.java new file mode 100644 index 00000000000..55655f0a29b --- /dev/null +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/NutanixVMDiskDeviceProperties.java @@ -0,0 +1,136 @@ + +package io.fabric8.openshift.api.model.machine.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({ + "adapterType", + "deviceIndex", + "deviceType" +}) +@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 NutanixVMDiskDeviceProperties implements Editable , KubernetesResource +{ + + @JsonProperty("adapterType") + private String adapterType; + @JsonProperty("deviceIndex") + private Integer deviceIndex; + @JsonProperty("deviceType") + private String deviceType; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public NutanixVMDiskDeviceProperties() { + } + + public NutanixVMDiskDeviceProperties(String adapterType, Integer deviceIndex, String deviceType) { + super(); + this.adapterType = adapterType; + this.deviceIndex = deviceIndex; + this.deviceType = deviceType; + } + + @JsonProperty("adapterType") + public String getAdapterType() { + return adapterType; + } + + @JsonProperty("adapterType") + public void setAdapterType(String adapterType) { + this.adapterType = adapterType; + } + + @JsonProperty("deviceIndex") + public Integer getDeviceIndex() { + return deviceIndex; + } + + @JsonProperty("deviceIndex") + public void setDeviceIndex(Integer deviceIndex) { + this.deviceIndex = deviceIndex; + } + + @JsonProperty("deviceType") + public String getDeviceType() { + return deviceType; + } + + @JsonProperty("deviceType") + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + @JsonIgnore + public NutanixVMDiskDevicePropertiesBuilder edit() { + return new NutanixVMDiskDevicePropertiesBuilder(this); + } + + @JsonIgnore + public NutanixVMDiskDevicePropertiesBuilder 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-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/NutanixVMStorageConfig.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/NutanixVMStorageConfig.java new file mode 100644 index 00000000000..07676e72f73 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/NutanixVMStorageConfig.java @@ -0,0 +1,122 @@ + +package io.fabric8.openshift.api.model.machine.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({ + "diskMode", + "storageContainer" +}) +@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 NutanixVMStorageConfig implements Editable , KubernetesResource +{ + + @JsonProperty("diskMode") + private String diskMode; + @JsonProperty("storageContainer") + private NutanixStorageResourceIdentifier storageContainer; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public NutanixVMStorageConfig() { + } + + public NutanixVMStorageConfig(String diskMode, NutanixStorageResourceIdentifier storageContainer) { + super(); + this.diskMode = diskMode; + this.storageContainer = storageContainer; + } + + @JsonProperty("diskMode") + public String getDiskMode() { + return diskMode; + } + + @JsonProperty("diskMode") + public void setDiskMode(String diskMode) { + this.diskMode = diskMode; + } + + @JsonProperty("storageContainer") + public NutanixStorageResourceIdentifier getStorageContainer() { + return storageContainer; + } + + @JsonProperty("storageContainer") + public void setStorageContainer(NutanixStorageResourceIdentifier storageContainer) { + this.storageContainer = storageContainer; + } + + @JsonIgnore + public NutanixVMStorageConfigBuilder edit() { + return new NutanixVMStorageConfigBuilder(this); + } + + @JsonIgnore + public NutanixVMStorageConfigBuilder 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-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/PowerVSMachineProviderConfig.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/PowerVSMachineProviderConfig.java new file mode 100644 index 00000000000..86e4c96fbaf --- /dev/null +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/PowerVSMachineProviderConfig.java @@ -0,0 +1,334 @@ + +package io.fabric8.openshift.api.model.machine.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.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", + "credentialsSecret", + "image", + "keyPairName", + "loadBalancers", + "memoryGiB", + "network", + "processorType", + "processors", + "serviceInstance", + "systemType", + "userDataSecret" +}) +@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("machine.openshift.io") +@Generated("jsonschema2pojo") +public class PowerVSMachineProviderConfig implements Editable , HasMetadata, Namespaced +{ + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + private String apiVersion = "machine.openshift.io/v1"; + @JsonProperty("credentialsSecret") + private PowerVSSecretReference credentialsSecret; + @JsonProperty("image") + private PowerVSResource image; + @JsonProperty("keyPairName") + private String keyPairName; + /** + * + * (Required) + * + */ + @JsonProperty("kind") + private String kind = "PowerVSMachineProviderConfig"; + @JsonProperty("loadBalancers") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List loadBalancers = new ArrayList<>(); + @JsonProperty("memoryGiB") + private Integer memoryGiB; + @JsonProperty("metadata") + private ObjectMeta metadata; + @JsonProperty("network") + private PowerVSResource network; + @JsonProperty("processorType") + private String processorType; + @JsonProperty("processors") + private IntOrString processors; + @JsonProperty("serviceInstance") + private PowerVSResource serviceInstance; + @JsonProperty("systemType") + private String systemType; + @JsonProperty("userDataSecret") + private PowerVSSecretReference userDataSecret; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public PowerVSMachineProviderConfig() { + } + + public PowerVSMachineProviderConfig(String apiVersion, PowerVSSecretReference credentialsSecret, PowerVSResource image, String keyPairName, String kind, List loadBalancers, Integer memoryGiB, ObjectMeta metadata, PowerVSResource network, String processorType, IntOrString processors, PowerVSResource serviceInstance, String systemType, PowerVSSecretReference userDataSecret) { + super(); + this.apiVersion = apiVersion; + this.credentialsSecret = credentialsSecret; + this.image = image; + this.keyPairName = keyPairName; + this.kind = kind; + this.loadBalancers = loadBalancers; + this.memoryGiB = memoryGiB; + this.metadata = metadata; + this.network = network; + this.processorType = processorType; + this.processors = processors; + this.serviceInstance = serviceInstance; + this.systemType = systemType; + this.userDataSecret = userDataSecret; + } + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + public String getApiVersion() { + return apiVersion; + } + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + public void setApiVersion(String apiVersion) { + this.apiVersion = apiVersion; + } + + @JsonProperty("credentialsSecret") + public PowerVSSecretReference getCredentialsSecret() { + return credentialsSecret; + } + + @JsonProperty("credentialsSecret") + public void setCredentialsSecret(PowerVSSecretReference credentialsSecret) { + this.credentialsSecret = credentialsSecret; + } + + @JsonProperty("image") + public PowerVSResource getImage() { + return image; + } + + @JsonProperty("image") + public void setImage(PowerVSResource image) { + this.image = image; + } + + @JsonProperty("keyPairName") + public String getKeyPairName() { + return keyPairName; + } + + @JsonProperty("keyPairName") + public void setKeyPairName(String keyPairName) { + this.keyPairName = keyPairName; + } + + /** + * + * (Required) + * + */ + @JsonProperty("kind") + public String getKind() { + return kind; + } + + /** + * + * (Required) + * + */ + @JsonProperty("kind") + public void setKind(String kind) { + this.kind = kind; + } + + @JsonProperty("loadBalancers") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getLoadBalancers() { + return loadBalancers; + } + + @JsonProperty("loadBalancers") + public void setLoadBalancers(List loadBalancers) { + this.loadBalancers = loadBalancers; + } + + @JsonProperty("memoryGiB") + public Integer getMemoryGiB() { + return memoryGiB; + } + + @JsonProperty("memoryGiB") + public void setMemoryGiB(Integer memoryGiB) { + this.memoryGiB = memoryGiB; + } + + @JsonProperty("metadata") + public ObjectMeta getMetadata() { + return metadata; + } + + @JsonProperty("metadata") + public void setMetadata(ObjectMeta metadata) { + this.metadata = metadata; + } + + @JsonProperty("network") + public PowerVSResource getNetwork() { + return network; + } + + @JsonProperty("network") + public void setNetwork(PowerVSResource network) { + this.network = network; + } + + @JsonProperty("processorType") + public String getProcessorType() { + return processorType; + } + + @JsonProperty("processorType") + public void setProcessorType(String processorType) { + this.processorType = processorType; + } + + @JsonProperty("processors") + public IntOrString getProcessors() { + return processors; + } + + @JsonProperty("processors") + public void setProcessors(IntOrString processors) { + this.processors = processors; + } + + @JsonProperty("serviceInstance") + public PowerVSResource getServiceInstance() { + return serviceInstance; + } + + @JsonProperty("serviceInstance") + public void setServiceInstance(PowerVSResource serviceInstance) { + this.serviceInstance = serviceInstance; + } + + @JsonProperty("systemType") + public String getSystemType() { + return systemType; + } + + @JsonProperty("systemType") + public void setSystemType(String systemType) { + this.systemType = systemType; + } + + @JsonProperty("userDataSecret") + public PowerVSSecretReference getUserDataSecret() { + return userDataSecret; + } + + @JsonProperty("userDataSecret") + public void setUserDataSecret(PowerVSSecretReference userDataSecret) { + this.userDataSecret = userDataSecret; + } + + @JsonIgnore + public PowerVSMachineProviderConfigBuilder edit() { + return new PowerVSMachineProviderConfigBuilder(this); + } + + @JsonIgnore + public PowerVSMachineProviderConfigBuilder 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-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/PowerVSResource.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/PowerVSResource.java new file mode 100644 index 00000000000..38b8ac9b033 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/PowerVSResource.java @@ -0,0 +1,150 @@ + +package io.fabric8.openshift.api.model.machine.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({ + "id", + "name", + "regex", + "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 PowerVSResource implements Editable , KubernetesResource +{ + + @JsonProperty("id") + private String id; + @JsonProperty("name") + private String name; + @JsonProperty("regex") + private String regex; + @JsonProperty("type") + private String type; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public PowerVSResource() { + } + + public PowerVSResource(String id, String name, String regex, String type) { + super(); + this.id = id; + this.name = name; + this.regex = regex; + this.type = type; + } + + @JsonProperty("id") + public String getId() { + return id; + } + + @JsonProperty("id") + public void setId(String id) { + this.id = id; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonProperty("regex") + public String getRegex() { + return regex; + } + + @JsonProperty("regex") + public void setRegex(String regex) { + this.regex = regex; + } + + @JsonProperty("type") + public String getType() { + return type; + } + + @JsonProperty("type") + public void setType(String type) { + this.type = type; + } + + @JsonIgnore + public PowerVSResourceBuilder edit() { + return new PowerVSResourceBuilder(this); + } + + @JsonIgnore + public PowerVSResourceBuilder 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-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/GCPFailureDomain.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/PowerVSSecretReference.java similarity index 82% rename from kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/GCPFailureDomain.java rename to kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/PowerVSSecretReference.java index ffaeea6304f..6570135ee67 100644 --- a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/GCPFailureDomain.java +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/PowerVSSecretReference.java @@ -31,7 +31,7 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "zone" + "name" }) @ToString @EqualsAndHashCode @@ -51,11 +51,11 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class GCPFailureDomain implements Editable , KubernetesResource +public class PowerVSSecretReference implements Editable , KubernetesResource { - @JsonProperty("zone") - private String zone; + @JsonProperty("name") + private String name; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -63,31 +63,31 @@ public class GCPFailureDomain implements Editable , Kub * No args constructor for use in serialization * */ - public GCPFailureDomain() { + public PowerVSSecretReference() { } - public GCPFailureDomain(String zone) { + public PowerVSSecretReference(String name) { super(); - this.zone = zone; + this.name = name; } - @JsonProperty("zone") - public String getZone() { - return zone; + @JsonProperty("name") + public String getName() { + return name; } - @JsonProperty("zone") - public void setZone(String zone) { - this.zone = zone; + @JsonProperty("name") + public void setName(String name) { + this.name = name; } @JsonIgnore - public GCPFailureDomainBuilder edit() { - return new GCPFailureDomainBuilder(this); + public PowerVSSecretReferenceBuilder edit() { + return new PowerVSSecretReferenceBuilder(this); } @JsonIgnore - public GCPFailureDomainBuilder toBuilder() { + public PowerVSSecretReferenceBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1alpha1/AdditionalBlockDevice.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1alpha1/AdditionalBlockDevice.java new file mode 100644 index 00000000000..1f7f2fad2e1 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1alpha1/AdditionalBlockDevice.java @@ -0,0 +1,136 @@ + +package io.fabric8.openshift.api.model.machine.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", + "sizeGiB", + "storage" +}) +@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 AdditionalBlockDevice implements Editable , KubernetesResource +{ + + @JsonProperty("name") + private String name; + @JsonProperty("sizeGiB") + private Integer sizeGiB; + @JsonProperty("storage") + private BlockDeviceStorage storage; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public AdditionalBlockDevice() { + } + + public AdditionalBlockDevice(String name, Integer sizeGiB, BlockDeviceStorage storage) { + super(); + this.name = name; + this.sizeGiB = sizeGiB; + this.storage = storage; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonProperty("sizeGiB") + public Integer getSizeGiB() { + return sizeGiB; + } + + @JsonProperty("sizeGiB") + public void setSizeGiB(Integer sizeGiB) { + this.sizeGiB = sizeGiB; + } + + @JsonProperty("storage") + public BlockDeviceStorage getStorage() { + return storage; + } + + @JsonProperty("storage") + public void setStorage(BlockDeviceStorage storage) { + this.storage = storage; + } + + @JsonIgnore + public AdditionalBlockDeviceBuilder edit() { + return new AdditionalBlockDeviceBuilder(this); + } + + @JsonIgnore + public AdditionalBlockDeviceBuilder 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-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1alpha1/BlockDeviceStorage.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1alpha1/BlockDeviceStorage.java new file mode 100644 index 00000000000..44006b5751f --- /dev/null +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1alpha1/BlockDeviceStorage.java @@ -0,0 +1,122 @@ + +package io.fabric8.openshift.api.model.machine.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({ + "type", + "volume" +}) +@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 BlockDeviceStorage implements Editable , KubernetesResource +{ + + @JsonProperty("type") + private String type; + @JsonProperty("volume") + private BlockDeviceVolume volume; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public BlockDeviceStorage() { + } + + public BlockDeviceStorage(String type, BlockDeviceVolume volume) { + super(); + this.type = type; + this.volume = volume; + } + + @JsonProperty("type") + public String getType() { + return type; + } + + @JsonProperty("type") + public void setType(String type) { + this.type = type; + } + + @JsonProperty("volume") + public BlockDeviceVolume getVolume() { + return volume; + } + + @JsonProperty("volume") + public void setVolume(BlockDeviceVolume volume) { + this.volume = volume; + } + + @JsonIgnore + public BlockDeviceStorageBuilder edit() { + return new BlockDeviceStorageBuilder(this); + } + + @JsonIgnore + public BlockDeviceStorageBuilder 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-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/AWSFailureDomainPlacement.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1alpha1/BlockDeviceVolume.java similarity index 82% rename from kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/AWSFailureDomainPlacement.java rename to kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1alpha1/BlockDeviceVolume.java index c10b0eac4d5..5f516c17838 100644 --- a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/AWSFailureDomainPlacement.java +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1alpha1/BlockDeviceVolume.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.machine.v1; +package io.fabric8.openshift.api.model.machine.v1alpha1; import java.util.LinkedHashMap; import java.util.Map; @@ -31,7 +31,8 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "availabilityZone" + "availabilityZone", + "type" }) @ToString @EqualsAndHashCode @@ -51,11 +52,13 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class AWSFailureDomainPlacement implements Editable , KubernetesResource +public class BlockDeviceVolume implements Editable , KubernetesResource { @JsonProperty("availabilityZone") private String availabilityZone; + @JsonProperty("type") + private String type; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -63,12 +66,13 @@ public class AWSFailureDomainPlacement implements Editable , HasMetadata, Namespaced { + @JsonProperty("additionalBlockDevices") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List additionalBlockDevices = new ArrayList<>(); /** * * (Required) @@ -119,7 +124,7 @@ public class OpenstackProviderSpec implements Editable networks = new ArrayList<>(); @@ -159,8 +164,9 @@ public class OpenstackProviderSpec implements Editable networks, List ports, String primarySubnet, RootVolume rootVolume, List securityGroups, String serverGroupID, String serverGroupName, Map serverMetadata, String sshUserName, List tags, Boolean trunk, SecretReference userDataSecret) { + public OpenstackProviderSpec(List additionalBlockDevices, String apiVersion, String availabilityZone, String cloudName, SecretReference cloudsSecret, Boolean configDrive, String flavor, String floatingIP, String image, String keyName, String kind, ObjectMeta metadata, List networks, List ports, String primarySubnet, RootVolume rootVolume, List securityGroups, String serverGroupID, String serverGroupName, Map serverMetadata, String sshUserName, List tags, Boolean trunk, SecretReference userDataSecret) { super(); + this.additionalBlockDevices = additionalBlockDevices; this.apiVersion = apiVersion; this.availabilityZone = availabilityZone; this.cloudName = cloudName; @@ -186,6 +192,17 @@ public OpenstackProviderSpec(String apiVersion, String availabilityZone, String this.userDataSecret = userDataSecret; } + @JsonProperty("additionalBlockDevices") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getAdditionalBlockDevices() { + return additionalBlockDevices; + } + + @JsonProperty("additionalBlockDevices") + public void setAdditionalBlockDevices(List additionalBlockDevices) { + this.additionalBlockDevices = additionalBlockDevices; + } + /** * * (Required) @@ -307,12 +324,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-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1alpha1/SubnetFilter.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1alpha1/SubnetFilter.java index 527f6f027d6..f88eb552c2c 100644 --- a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1alpha1/SubnetFilter.java +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1alpha1/SubnetFilter.java @@ -81,7 +81,7 @@ public class SubnetFilter implements Editable , KubernetesR @JsonProperty("enableDhcp") private Boolean enableDhcp; @JsonProperty("gateway_ip") - private String gatewayIp; + private String gateway_ip; @JsonProperty("id") private String id; @JsonProperty("ipVersion") @@ -126,12 +126,12 @@ public class SubnetFilter implements Editable , KubernetesR public SubnetFilter() { } - public SubnetFilter(String cidr, String description, Boolean enableDhcp, String gatewayIp, String id, Integer ipVersion, String ipv6AddressMode, String ipv6RaMode, Integer limit, String marker, String name, String networkId, String notTags, String notTagsAny, String projectId, String sortDir, String sortKey, String subnetpoolId, String tags, String tagsAny, String tenantId) { + public SubnetFilter(String cidr, String description, Boolean enableDhcp, String gateway_ip, String id, Integer ipVersion, String ipv6AddressMode, String ipv6RaMode, Integer limit, String marker, String name, String networkId, String notTags, String notTagsAny, String projectId, String sortDir, String sortKey, String subnetpoolId, String tags, String tagsAny, String tenantId) { super(); this.cidr = cidr; this.description = description; this.enableDhcp = enableDhcp; - this.gatewayIp = gatewayIp; + this.gateway_ip = gateway_ip; this.id = id; this.ipVersion = ipVersion; this.ipv6AddressMode = ipv6AddressMode; @@ -182,13 +182,13 @@ public void setEnableDhcp(Boolean enableDhcp) { } @JsonProperty("gateway_ip") - public String getGatewayIp() { - return gatewayIp; + public String getGateway_ip() { + return gateway_ip; } @JsonProperty("gateway_ip") - public void setGatewayIp(String gatewayIp) { - this.gatewayIp = gatewayIp; + public void setGateway_ip(String gateway_ip) { + this.gateway_ip = gateway_ip; } @JsonProperty("id") diff --git a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/Machine.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/Machine.java index 264c1db053b..94cac6f9b35 100644 --- a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/Machine.java +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/Machine.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 Machine implements Editable , HasMetadata, Namespac @JsonProperty("kind") private String kind = "Machine"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("spec") private MachineSpec spec; @JsonProperty("status") @@ -97,7 +98,7 @@ public class Machine implements Editable , HasMetadata, Namespac public Machine() { } - public Machine(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, MachineSpec spec, MachineStatus status) { + public Machine(String apiVersion, String kind, ObjectMeta metadata, MachineSpec spec, MachineStatus 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-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineHealthCheck.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineHealthCheck.java index 71e69fafcd6..134bd38b25f 100644 --- a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineHealthCheck.java +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineHealthCheck.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 MachineHealthCheck implements Editable , @JsonProperty("kind") private String kind = "MachineHealthCheck"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("spec") private MachineHealthCheckSpec spec; @JsonProperty("status") @@ -97,7 +98,7 @@ public class MachineHealthCheck implements Editable , public MachineHealthCheck() { } - public MachineHealthCheck(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, MachineHealthCheckSpec spec, MachineHealthCheckStatus status) { + public MachineHealthCheck(String apiVersion, String kind, ObjectMeta metadata, MachineHealthCheckSpec spec, MachineHealthCheckStatus 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-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineHealthCheckSpec.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineHealthCheckSpec.java index 9c0a6ce063e..d3227fd42a3 100644 --- a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineHealthCheckSpec.java +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineHealthCheckSpec.java @@ -15,10 +15,12 @@ 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; @@ -45,12 +47,12 @@ }) @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), - @BuildableReference(io.fabric8.kubernetes.api.model.IntOrString.class), - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), @BuildableReference(LocalObjectReference.class), @BuildableReference(PersistentVolumeClaim.class) }) @@ -59,16 +61,17 @@ public class MachineHealthCheckSpec implements Editable unhealthyConditions = new ArrayList<>(); + private List unhealthyConditions = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -79,7 +82,7 @@ public class MachineHealthCheckSpec implements Editable unhealthyConditions) { + public MachineHealthCheckSpec(Object maxUnhealthy, String nodeStartupTimeout, MachineHealthCheckSpecRemediationTemplate remediationTemplate, MachineHealthCheckSpecSelector selector, List unhealthyConditions) { super(); this.maxUnhealthy = maxUnhealthy; this.nodeStartupTimeout = nodeStartupTimeout; @@ -89,53 +92,54 @@ public MachineHealthCheckSpec(io.fabric8.kubernetes.api.model.IntOrString maxUnh } @JsonProperty("maxUnhealthy") - public io.fabric8.kubernetes.api.model.IntOrString getMaxUnhealthy() { + public Object getMaxUnhealthy() { return maxUnhealthy; } @JsonProperty("maxUnhealthy") - public void setMaxUnhealthy(io.fabric8.kubernetes.api.model.IntOrString maxUnhealthy) { + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + public void setMaxUnhealthy(Object maxUnhealthy) { this.maxUnhealthy = maxUnhealthy; } @JsonProperty("nodeStartupTimeout") - public Duration getNodeStartupTimeout() { + public String getNodeStartupTimeout() { return nodeStartupTimeout; } @JsonProperty("nodeStartupTimeout") - public void setNodeStartupTimeout(Duration nodeStartupTimeout) { + public void setNodeStartupTimeout(String nodeStartupTimeout) { this.nodeStartupTimeout = nodeStartupTimeout; } @JsonProperty("remediationTemplate") - public io.fabric8.kubernetes.api.model.ObjectReference getRemediationTemplate() { + public MachineHealthCheckSpecRemediationTemplate getRemediationTemplate() { return remediationTemplate; } @JsonProperty("remediationTemplate") - public void setRemediationTemplate(io.fabric8.kubernetes.api.model.ObjectReference remediationTemplate) { + public void setRemediationTemplate(MachineHealthCheckSpecRemediationTemplate remediationTemplate) { this.remediationTemplate = remediationTemplate; } @JsonProperty("selector") - public io.fabric8.kubernetes.api.model.LabelSelector getSelector() { + public MachineHealthCheckSpecSelector getSelector() { return selector; } @JsonProperty("selector") - public void setSelector(io.fabric8.kubernetes.api.model.LabelSelector selector) { + public void setSelector(MachineHealthCheckSpecSelector selector) { this.selector = selector; } @JsonProperty("unhealthyConditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getUnhealthyConditions() { + public List getUnhealthyConditions() { return unhealthyConditions; } @JsonProperty("unhealthyConditions") - public void setUnhealthyConditions(List unhealthyConditions) { + public void setUnhealthyConditions(List unhealthyConditions) { this.unhealthyConditions = unhealthyConditions; } diff --git a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineHealthCheckSpecRemediationTemplate.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineHealthCheckSpecRemediationTemplate.java new file mode 100644 index 00000000000..926133c69bd --- /dev/null +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineHealthCheckSpecRemediationTemplate.java @@ -0,0 +1,192 @@ + +package io.fabric8.openshift.api.model.machine.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({ + "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 MachineHealthCheckSpecRemediationTemplate 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 MachineHealthCheckSpecRemediationTemplate() { + } + + public MachineHealthCheckSpecRemediationTemplate(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 MachineHealthCheckSpecRemediationTemplateBuilder edit() { + return new MachineHealthCheckSpecRemediationTemplateBuilder(this); + } + + @JsonIgnore + public MachineHealthCheckSpecRemediationTemplateBuilder 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-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineHealthCheckSpecSelector.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineHealthCheckSpecSelector.java new file mode 100644 index 00000000000..1cb14b8455f --- /dev/null +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineHealthCheckSpecSelector.java @@ -0,0 +1,129 @@ + +package io.fabric8.openshift.api.model.machine.v1beta1; + +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.LabelSelectorRequirement; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.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({ + "matchExpressions", + "matchLabels" +}) +@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 MachineHealthCheckSpecSelector implements Editable , KubernetesResource +{ + + @JsonProperty("matchExpressions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List matchExpressions = new ArrayList<>(); + @JsonProperty("matchLabels") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private Map matchLabels = new LinkedHashMap<>(); + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public MachineHealthCheckSpecSelector() { + } + + public MachineHealthCheckSpecSelector(List matchExpressions, Map matchLabels) { + super(); + this.matchExpressions = matchExpressions; + this.matchLabels = matchLabels; + } + + @JsonProperty("matchExpressions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getMatchExpressions() { + return matchExpressions; + } + + @JsonProperty("matchExpressions") + public void setMatchExpressions(List matchExpressions) { + this.matchExpressions = matchExpressions; + } + + @JsonProperty("matchLabels") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public Map getMatchLabels() { + return matchLabels; + } + + @JsonProperty("matchLabels") + public void setMatchLabels(Map matchLabels) { + this.matchLabels = matchLabels; + } + + @JsonIgnore + public MachineHealthCheckSpecSelectorBuilder edit() { + return new MachineHealthCheckSpecSelectorBuilder(this); + } + + @JsonIgnore + public MachineHealthCheckSpecSelectorBuilder 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-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/UnhealthyCondition.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineHealthCheckSpecUnhealthyConditions.java similarity index 85% rename from kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/UnhealthyCondition.java rename to kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineHealthCheckSpecUnhealthyConditions.java index 76be4df8f84..7b27db4cf4f 100644 --- a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/UnhealthyCondition.java +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineHealthCheckSpecUnhealthyConditions.java @@ -13,7 +13,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.Duration; import io.fabric8.kubernetes.api.model.IntOrString; import io.fabric8.kubernetes.api.model.KubernetesResource; import io.fabric8.kubernetes.api.model.LabelSelector; @@ -54,13 +53,13 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class UnhealthyCondition implements Editable , KubernetesResource +public class MachineHealthCheckSpecUnhealthyConditions implements Editable , KubernetesResource { @JsonProperty("status") private String status; @JsonProperty("timeout") - private Duration timeout; + private String timeout; @JsonProperty("type") private String type; @JsonIgnore @@ -70,10 +69,10 @@ public class UnhealthyCondition implements Editable , * No args constructor for use in serialization * */ - public UnhealthyCondition() { + public MachineHealthCheckSpecUnhealthyConditions() { } - public UnhealthyCondition(String status, Duration timeout, String type) { + public MachineHealthCheckSpecUnhealthyConditions(String status, String timeout, String type) { super(); this.status = status; this.timeout = timeout; @@ -91,12 +90,12 @@ public void setStatus(String status) { } @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 UnhealthyConditionBuilder edit() { - return new UnhealthyConditionBuilder(this); + public MachineHealthCheckSpecUnhealthyConditionsBuilder edit() { + return new MachineHealthCheckSpecUnhealthyConditionsBuilder(this); } @JsonIgnore - public UnhealthyConditionBuilder toBuilder() { + public MachineHealthCheckSpecUnhealthyConditionsBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineHealthCheckStatus.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineHealthCheckStatus.java index aaa0ffb1bdb..22fe8df24b4 100644 --- a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineHealthCheckStatus.java +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineHealthCheckStatus.java @@ -61,7 +61,7 @@ public class MachineHealthCheckStatus implements Editable conditions = new ArrayList<>(); + private List conditions = new ArrayList<>(); @JsonProperty("currentHealthy") private Integer currentHealthy; @JsonProperty("expectedMachines") @@ -78,7 +78,7 @@ public class MachineHealthCheckStatus implements Editable conditions, Integer currentHealthy, Integer expectedMachines, Integer remediationsAllowed) { + public MachineHealthCheckStatus(List conditions, Integer currentHealthy, Integer expectedMachines, Integer remediationsAllowed) { super(); this.conditions = conditions; this.currentHealthy = currentHealthy; @@ -88,12 +88,12 @@ public MachineHealthCheckStatus(List conditions, Integer currentHealt @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-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineHealthCheckStatusConditions.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineHealthCheckStatusConditions.java new file mode 100644 index 00000000000..37d5959c2f7 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineHealthCheckStatusConditions.java @@ -0,0 +1,178 @@ + +package io.fabric8.openshift.api.model.machine.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", + "reason", + "severity", + "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 MachineHealthCheckStatusConditions implements Editable , KubernetesResource +{ + + @JsonProperty("lastTransitionTime") + private String lastTransitionTime; + @JsonProperty("message") + private String message; + @JsonProperty("reason") + private String reason; + @JsonProperty("severity") + private String severity; + @JsonProperty("status") + private String status; + @JsonProperty("type") + private String type; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public MachineHealthCheckStatusConditions() { + } + + public MachineHealthCheckStatusConditions(String lastTransitionTime, String message, String reason, String severity, String status, String type) { + super(); + this.lastTransitionTime = lastTransitionTime; + this.message = message; + this.reason = reason; + this.severity = severity; + 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("reason") + public String getReason() { + return reason; + } + + @JsonProperty("reason") + public void setReason(String reason) { + this.reason = reason; + } + + @JsonProperty("severity") + public String getSeverity() { + return severity; + } + + @JsonProperty("severity") + public void setSeverity(String severity) { + this.severity = severity; + } + + @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 MachineHealthCheckStatusConditionsBuilder edit() { + return new MachineHealthCheckStatusConditionsBuilder(this); + } + + @JsonIgnore + public MachineHealthCheckStatusConditionsBuilder 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-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSet.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSet.java index df3f1fd5f45..88bd2fa2600 100644 --- a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSet.java +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSet.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 MachineSet implements Editable , HasMetadata, Na @JsonProperty("kind") private String kind = "MachineSet"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("spec") private MachineSetSpec spec; @JsonProperty("status") @@ -97,7 +98,7 @@ public class MachineSet implements Editable , HasMetadata, Na public MachineSet() { } - public MachineSet(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, MachineSetSpec spec, MachineSetStatus status) { + public MachineSet(String apiVersion, String kind, ObjectMeta metadata, MachineSetSpec spec, MachineSetStatus 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-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSetSpec.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSetSpec.java index bfe5a9d855a..192454cff22 100644 --- a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSetSpec.java +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSetSpec.java @@ -15,6 +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.LabelSelector; import io.fabric8.kubernetes.api.model.LocalObjectReference; import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; @@ -44,7 +45,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), @@ -64,9 +65,9 @@ public class MachineSetSpec implements Editable , Kuberne @JsonProperty("replicas") private Integer replicas; @JsonProperty("selector") - private io.fabric8.kubernetes.api.model.LabelSelector selector; + private MachineSetSpecSelector selector; @JsonProperty("template") - private MachineTemplateSpec template; + private MachineSetSpecTemplate template; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -77,7 +78,7 @@ public class MachineSetSpec implements Editable , Kuberne public MachineSetSpec() { } - public MachineSetSpec(String deletePolicy, Integer minReadySeconds, Integer replicas, io.fabric8.kubernetes.api.model.LabelSelector selector, MachineTemplateSpec template) { + public MachineSetSpec(String deletePolicy, Integer minReadySeconds, Integer replicas, MachineSetSpecSelector selector, MachineSetSpecTemplate template) { super(); this.deletePolicy = deletePolicy; this.minReadySeconds = minReadySeconds; @@ -117,22 +118,22 @@ public void setReplicas(Integer replicas) { } @JsonProperty("selector") - public io.fabric8.kubernetes.api.model.LabelSelector getSelector() { + public MachineSetSpecSelector getSelector() { return selector; } @JsonProperty("selector") - public void setSelector(io.fabric8.kubernetes.api.model.LabelSelector selector) { + public void setSelector(MachineSetSpecSelector selector) { this.selector = selector; } @JsonProperty("template") - public MachineTemplateSpec getTemplate() { + public MachineSetSpecTemplate getTemplate() { return template; } @JsonProperty("template") - public void setTemplate(MachineTemplateSpec template) { + public void setTemplate(MachineSetSpecTemplate template) { this.template = template; } diff --git a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSetSpecSelector.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSetSpecSelector.java new file mode 100644 index 00000000000..55bd0a1185c --- /dev/null +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSetSpecSelector.java @@ -0,0 +1,129 @@ + +package io.fabric8.openshift.api.model.machine.v1beta1; + +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.LabelSelectorRequirement; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.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({ + "matchExpressions", + "matchLabels" +}) +@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 MachineSetSpecSelector implements Editable , KubernetesResource +{ + + @JsonProperty("matchExpressions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List matchExpressions = new ArrayList<>(); + @JsonProperty("matchLabels") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private Map matchLabels = new LinkedHashMap<>(); + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public MachineSetSpecSelector() { + } + + public MachineSetSpecSelector(List matchExpressions, Map matchLabels) { + super(); + this.matchExpressions = matchExpressions; + this.matchLabels = matchLabels; + } + + @JsonProperty("matchExpressions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getMatchExpressions() { + return matchExpressions; + } + + @JsonProperty("matchExpressions") + public void setMatchExpressions(List matchExpressions) { + this.matchExpressions = matchExpressions; + } + + @JsonProperty("matchLabels") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public Map getMatchLabels() { + return matchLabels; + } + + @JsonProperty("matchLabels") + public void setMatchLabels(Map matchLabels) { + this.matchLabels = matchLabels; + } + + @JsonIgnore + public MachineSetSpecSelectorBuilder edit() { + return new MachineSetSpecSelectorBuilder(this); + } + + @JsonIgnore + public MachineSetSpecSelectorBuilder 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-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSetSpecTMetadata.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSetSpecTMetadata.java new file mode 100644 index 00000000000..af127f50c80 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSetSpecTMetadata.java @@ -0,0 +1,187 @@ + +package io.fabric8.openshift.api.model.machine.v1beta1; + +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.OwnerReference; +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({ + "annotations", + "generateName", + "labels", + "name", + "namespace", + "ownerReferences" +}) +@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 MachineSetSpecTMetadata implements Editable , KubernetesResource +{ + + @JsonProperty("annotations") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private Map annotations = new LinkedHashMap<>(); + @JsonProperty("generateName") + private String generateName; + @JsonProperty("labels") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private Map labels = new LinkedHashMap<>(); + @JsonProperty("name") + private String name; + @JsonProperty("namespace") + private String namespace; + @JsonProperty("ownerReferences") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List ownerReferences = new ArrayList<>(); + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public MachineSetSpecTMetadata() { + } + + public MachineSetSpecTMetadata(Map annotations, String generateName, Map labels, String name, String namespace, List ownerReferences) { + super(); + this.annotations = annotations; + this.generateName = generateName; + this.labels = labels; + this.name = name; + this.namespace = namespace; + this.ownerReferences = ownerReferences; + } + + @JsonProperty("annotations") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public Map getAnnotations() { + return annotations; + } + + @JsonProperty("annotations") + public void setAnnotations(Map annotations) { + this.annotations = annotations; + } + + @JsonProperty("generateName") + public String getGenerateName() { + return generateName; + } + + @JsonProperty("generateName") + public void setGenerateName(String generateName) { + this.generateName = generateName; + } + + @JsonProperty("labels") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public Map getLabels() { + return labels; + } + + @JsonProperty("labels") + public void setLabels(Map labels) { + this.labels = labels; + } + + @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("ownerReferences") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getOwnerReferences() { + return ownerReferences; + } + + @JsonProperty("ownerReferences") + public void setOwnerReferences(List ownerReferences) { + this.ownerReferences = ownerReferences; + } + + @JsonIgnore + public MachineSetSpecTMetadataBuilder edit() { + return new MachineSetSpecTMetadataBuilder(this); + } + + @JsonIgnore + public MachineSetSpecTMetadataBuilder 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-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSetSpecTSpec.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSetSpecTSpec.java new file mode 100644 index 00000000000..4040b47a3d7 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSetSpecTSpec.java @@ -0,0 +1,168 @@ + +package io.fabric8.openshift.api.model.machine.v1beta1; + +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({ + "metadata", + "lifecycleHooks", + "providerID", + "providerSpec", + "taints" +}) +@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 MachineSetSpecTSpec implements Editable , KubernetesResource +{ + + @JsonProperty("lifecycleHooks") + private MachineSetSpecTSpecLifecycleHooks lifecycleHooks; + @JsonProperty("metadata") + private MachineSetSpecTSpecMetadata metadata; + @JsonProperty("providerID") + private String providerID; + @JsonProperty("providerSpec") + private MachineSetSpecTSpecProviderSpec providerSpec; + @JsonProperty("taints") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List taints = new ArrayList<>(); + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public MachineSetSpecTSpec() { + } + + public MachineSetSpecTSpec(MachineSetSpecTSpecLifecycleHooks lifecycleHooks, MachineSetSpecTSpecMetadata metadata, String providerID, MachineSetSpecTSpecProviderSpec providerSpec, List taints) { + super(); + this.lifecycleHooks = lifecycleHooks; + this.metadata = metadata; + this.providerID = providerID; + this.providerSpec = providerSpec; + this.taints = taints; + } + + @JsonProperty("lifecycleHooks") + public MachineSetSpecTSpecLifecycleHooks getLifecycleHooks() { + return lifecycleHooks; + } + + @JsonProperty("lifecycleHooks") + public void setLifecycleHooks(MachineSetSpecTSpecLifecycleHooks lifecycleHooks) { + this.lifecycleHooks = lifecycleHooks; + } + + @JsonProperty("metadata") + public MachineSetSpecTSpecMetadata getMetadata() { + return metadata; + } + + @JsonProperty("metadata") + public void setMetadata(MachineSetSpecTSpecMetadata metadata) { + this.metadata = metadata; + } + + @JsonProperty("providerID") + public String getProviderID() { + return providerID; + } + + @JsonProperty("providerID") + public void setProviderID(String providerID) { + this.providerID = providerID; + } + + @JsonProperty("providerSpec") + public MachineSetSpecTSpecProviderSpec getProviderSpec() { + return providerSpec; + } + + @JsonProperty("providerSpec") + public void setProviderSpec(MachineSetSpecTSpecProviderSpec providerSpec) { + this.providerSpec = providerSpec; + } + + @JsonProperty("taints") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getTaints() { + return taints; + } + + @JsonProperty("taints") + public void setTaints(List taints) { + this.taints = taints; + } + + @JsonIgnore + public MachineSetSpecTSpecBuilder edit() { + return new MachineSetSpecTSpecBuilder(this); + } + + @JsonIgnore + public MachineSetSpecTSpecBuilder 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-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSetSpecTSpecLHPreDrain.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSetSpecTSpecLHPreDrain.java new file mode 100644 index 00000000000..463ffc3cf1b --- /dev/null +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSetSpecTSpecLHPreDrain.java @@ -0,0 +1,122 @@ + +package io.fabric8.openshift.api.model.machine.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", + "owner" +}) +@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 MachineSetSpecTSpecLHPreDrain implements Editable , KubernetesResource +{ + + @JsonProperty("name") + private String name; + @JsonProperty("owner") + private String owner; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public MachineSetSpecTSpecLHPreDrain() { + } + + public MachineSetSpecTSpecLHPreDrain(String name, String owner) { + super(); + this.name = name; + this.owner = owner; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonProperty("owner") + public String getOwner() { + return owner; + } + + @JsonProperty("owner") + public void setOwner(String owner) { + this.owner = owner; + } + + @JsonIgnore + public MachineSetSpecTSpecLHPreDrainBuilder edit() { + return new MachineSetSpecTSpecLHPreDrainBuilder(this); + } + + @JsonIgnore + public MachineSetSpecTSpecLHPreDrainBuilder 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-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSetSpecTSpecLHPreTerminate.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSetSpecTSpecLHPreTerminate.java new file mode 100644 index 00000000000..55246532a0b --- /dev/null +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSetSpecTSpecLHPreTerminate.java @@ -0,0 +1,122 @@ + +package io.fabric8.openshift.api.model.machine.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", + "owner" +}) +@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 MachineSetSpecTSpecLHPreTerminate implements Editable , KubernetesResource +{ + + @JsonProperty("name") + private String name; + @JsonProperty("owner") + private String owner; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public MachineSetSpecTSpecLHPreTerminate() { + } + + public MachineSetSpecTSpecLHPreTerminate(String name, String owner) { + super(); + this.name = name; + this.owner = owner; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonProperty("owner") + public String getOwner() { + return owner; + } + + @JsonProperty("owner") + public void setOwner(String owner) { + this.owner = owner; + } + + @JsonIgnore + public MachineSetSpecTSpecLHPreTerminateBuilder edit() { + return new MachineSetSpecTSpecLHPreTerminateBuilder(this); + } + + @JsonIgnore + public MachineSetSpecTSpecLHPreTerminateBuilder 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-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSetSpecTSpecLifecycleHooks.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSetSpecTSpecLifecycleHooks.java new file mode 100644 index 00000000000..9493f837dab --- /dev/null +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSetSpecTSpecLifecycleHooks.java @@ -0,0 +1,128 @@ + +package io.fabric8.openshift.api.model.machine.v1beta1; + +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({ + "preDrain", + "preTerminate" +}) +@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 MachineSetSpecTSpecLifecycleHooks implements Editable , KubernetesResource +{ + + @JsonProperty("preDrain") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List preDrain = new ArrayList<>(); + @JsonProperty("preTerminate") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List preTerminate = new ArrayList<>(); + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public MachineSetSpecTSpecLifecycleHooks() { + } + + public MachineSetSpecTSpecLifecycleHooks(List preDrain, List preTerminate) { + super(); + this.preDrain = preDrain; + this.preTerminate = preTerminate; + } + + @JsonProperty("preDrain") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getPreDrain() { + return preDrain; + } + + @JsonProperty("preDrain") + public void setPreDrain(List preDrain) { + this.preDrain = preDrain; + } + + @JsonProperty("preTerminate") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getPreTerminate() { + return preTerminate; + } + + @JsonProperty("preTerminate") + public void setPreTerminate(List preTerminate) { + this.preTerminate = preTerminate; + } + + @JsonIgnore + public MachineSetSpecTSpecLifecycleHooksBuilder edit() { + return new MachineSetSpecTSpecLifecycleHooksBuilder(this); + } + + @JsonIgnore + public MachineSetSpecTSpecLifecycleHooksBuilder 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-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSetSpecTSpecMetadata.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSetSpecTSpecMetadata.java new file mode 100644 index 00000000000..26e4d3d8434 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSetSpecTSpecMetadata.java @@ -0,0 +1,187 @@ + +package io.fabric8.openshift.api.model.machine.v1beta1; + +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.OwnerReference; +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({ + "annotations", + "generateName", + "labels", + "name", + "namespace", + "ownerReferences" +}) +@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 MachineSetSpecTSpecMetadata implements Editable , KubernetesResource +{ + + @JsonProperty("annotations") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private Map annotations = new LinkedHashMap<>(); + @JsonProperty("generateName") + private String generateName; + @JsonProperty("labels") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private Map labels = new LinkedHashMap<>(); + @JsonProperty("name") + private String name; + @JsonProperty("namespace") + private String namespace; + @JsonProperty("ownerReferences") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List ownerReferences = new ArrayList<>(); + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public MachineSetSpecTSpecMetadata() { + } + + public MachineSetSpecTSpecMetadata(Map annotations, String generateName, Map labels, String name, String namespace, List ownerReferences) { + super(); + this.annotations = annotations; + this.generateName = generateName; + this.labels = labels; + this.name = name; + this.namespace = namespace; + this.ownerReferences = ownerReferences; + } + + @JsonProperty("annotations") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public Map getAnnotations() { + return annotations; + } + + @JsonProperty("annotations") + public void setAnnotations(Map annotations) { + this.annotations = annotations; + } + + @JsonProperty("generateName") + public String getGenerateName() { + return generateName; + } + + @JsonProperty("generateName") + public void setGenerateName(String generateName) { + this.generateName = generateName; + } + + @JsonProperty("labels") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public Map getLabels() { + return labels; + } + + @JsonProperty("labels") + public void setLabels(Map labels) { + this.labels = labels; + } + + @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("ownerReferences") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getOwnerReferences() { + return ownerReferences; + } + + @JsonProperty("ownerReferences") + public void setOwnerReferences(List ownerReferences) { + this.ownerReferences = ownerReferences; + } + + @JsonIgnore + public MachineSetSpecTSpecMetadataBuilder edit() { + return new MachineSetSpecTSpecMetadataBuilder(this); + } + + @JsonIgnore + public MachineSetSpecTSpecMetadataBuilder 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-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSetSpecTSpecProviderSpec.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSetSpecTSpecProviderSpec.java new file mode 100644 index 00000000000..07061d22fcb --- /dev/null +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSetSpecTSpecProviderSpec.java @@ -0,0 +1,110 @@ + +package io.fabric8.openshift.api.model.machine.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({ + "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 MachineSetSpecTSpecProviderSpec implements Editable , KubernetesResource +{ + + @JsonProperty("value") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + private Object value; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public MachineSetSpecTSpecProviderSpec() { + } + + public MachineSetSpecTSpecProviderSpec(Object value) { + super(); + this.value = value; + } + + @JsonProperty("value") + public Object getValue() { + return value; + } + + @JsonProperty("value") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + public void setValue(Object value) { + this.value = value; + } + + @JsonIgnore + public MachineSetSpecTSpecProviderSpecBuilder edit() { + return new MachineSetSpecTSpecProviderSpecBuilder(this); + } + + @JsonIgnore + public MachineSetSpecTSpecProviderSpecBuilder 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-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSetSpecTSpecTaints.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSetSpecTSpecTaints.java new file mode 100644 index 00000000000..f8bcb82a0b3 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSetSpecTSpecTaints.java @@ -0,0 +1,150 @@ + +package io.fabric8.openshift.api.model.machine.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({ + "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 MachineSetSpecTSpecTaints 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 MachineSetSpecTSpecTaints() { + } + + public MachineSetSpecTSpecTaints(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 MachineSetSpecTSpecTaintsBuilder edit() { + return new MachineSetSpecTSpecTaintsBuilder(this); + } + + @JsonIgnore + public MachineSetSpecTSpecTaintsBuilder 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-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineTemplateSpec.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSetSpecTemplate.java similarity index 79% rename from kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineTemplateSpec.java rename to kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSetSpecTemplate.java index 8ed5254e0aa..64fba9c866a 100644 --- a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineTemplateSpec.java +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSetSpecTemplate.java @@ -17,6 +17,7 @@ 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; @@ -40,7 +41,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), @@ -51,13 +52,13 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class MachineTemplateSpec implements Editable , KubernetesResource +public class MachineSetSpecTemplate implements Editable , KubernetesResource { @JsonProperty("metadata") - private io.fabric8.openshift.api.model.machine.v1beta1.ObjectMeta metadata; + private MachineSetSpecTMetadata metadata; @JsonProperty("spec") - private MachineSpec spec; + private MachineSetSpecTSpec spec; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -65,42 +66,42 @@ public class MachineTemplateSpec implements Editable * No args constructor for use in serialization * */ - public MachineTemplateSpec() { + public MachineSetSpecTemplate() { } - public MachineTemplateSpec(io.fabric8.openshift.api.model.machine.v1beta1.ObjectMeta metadata, MachineSpec spec) { + public MachineSetSpecTemplate(MachineSetSpecTMetadata metadata, MachineSetSpecTSpec spec) { super(); this.metadata = metadata; this.spec = spec; } @JsonProperty("metadata") - public io.fabric8.openshift.api.model.machine.v1beta1.ObjectMeta getMetadata() { + public MachineSetSpecTMetadata getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.openshift.api.model.machine.v1beta1.ObjectMeta metadata) { + public void setMetadata(MachineSetSpecTMetadata metadata) { this.metadata = metadata; } @JsonProperty("spec") - public MachineSpec getSpec() { + public MachineSetSpecTSpec getSpec() { return spec; } @JsonProperty("spec") - public void setSpec(MachineSpec spec) { + public void setSpec(MachineSetSpecTSpec spec) { this.spec = spec; } @JsonIgnore - public MachineTemplateSpecBuilder edit() { - return new MachineTemplateSpecBuilder(this); + public MachineSetSpecTemplateBuilder edit() { + return new MachineSetSpecTemplateBuilder(this); } @JsonIgnore - public MachineTemplateSpecBuilder toBuilder() { + public MachineSetSpecTemplateBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSetStatus.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSetStatus.java index 336175b1148..e8928b12fc9 100644 --- a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSetStatus.java +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSetStatus.java @@ -1,7 +1,9 @@ package io.fabric8.openshift.api.model.machine.v1beta1; +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; @@ -32,6 +34,7 @@ @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ "availableReplicas", + "conditions", "errorMessage", "errorReason", "fullyLabeledReplicas", @@ -62,6 +65,9 @@ public class MachineSetStatus implements Editable , Kub @JsonProperty("availableReplicas") private Integer availableReplicas; + @JsonProperty("conditions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List conditions = new ArrayList<>(); @JsonProperty("errorMessage") private String errorMessage; @JsonProperty("errorReason") @@ -84,9 +90,10 @@ public class MachineSetStatus implements Editable , Kub public MachineSetStatus() { } - public MachineSetStatus(Integer availableReplicas, String errorMessage, String errorReason, Integer fullyLabeledReplicas, Long observedGeneration, Integer readyReplicas, Integer replicas) { + public MachineSetStatus(Integer availableReplicas, List conditions, String errorMessage, String errorReason, Integer fullyLabeledReplicas, Long observedGeneration, Integer readyReplicas, Integer replicas) { super(); this.availableReplicas = availableReplicas; + this.conditions = conditions; this.errorMessage = errorMessage; this.errorReason = errorReason; this.fullyLabeledReplicas = fullyLabeledReplicas; @@ -105,6 +112,17 @@ public void setAvailableReplicas(Integer availableReplicas) { this.availableReplicas = availableReplicas; } + @JsonProperty("conditions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getConditions() { + return conditions; + } + + @JsonProperty("conditions") + public void setConditions(List conditions) { + this.conditions = conditions; + } + @JsonProperty("errorMessage") public String getErrorMessage() { return errorMessage; diff --git a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSetStatusConditions.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSetStatusConditions.java new file mode 100644 index 00000000000..ed19a42c68f --- /dev/null +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSetStatusConditions.java @@ -0,0 +1,178 @@ + +package io.fabric8.openshift.api.model.machine.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", + "reason", + "severity", + "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 MachineSetStatusConditions implements Editable , KubernetesResource +{ + + @JsonProperty("lastTransitionTime") + private String lastTransitionTime; + @JsonProperty("message") + private String message; + @JsonProperty("reason") + private String reason; + @JsonProperty("severity") + private String severity; + @JsonProperty("status") + private String status; + @JsonProperty("type") + private String type; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public MachineSetStatusConditions() { + } + + public MachineSetStatusConditions(String lastTransitionTime, String message, String reason, String severity, String status, String type) { + super(); + this.lastTransitionTime = lastTransitionTime; + this.message = message; + this.reason = reason; + this.severity = severity; + 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("reason") + public String getReason() { + return reason; + } + + @JsonProperty("reason") + public void setReason(String reason) { + this.reason = reason; + } + + @JsonProperty("severity") + public String getSeverity() { + return severity; + } + + @JsonProperty("severity") + public void setSeverity(String severity) { + this.severity = severity; + } + + @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 MachineSetStatusConditionsBuilder edit() { + return new MachineSetStatusConditionsBuilder(this); + } + + @JsonIgnore + public MachineSetStatusConditionsBuilder 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-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSpec.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSpec.java index cf00f1d2787..dedec8d2213 100644 --- a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSpec.java +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSpec.java @@ -19,11 +19,11 @@ 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.Taint; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; import lombok.EqualsAndHashCode; @@ -46,7 +46,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,16 +61,16 @@ public class MachineSpec implements Editable , KubernetesRes { @JsonProperty("lifecycleHooks") - private LifecycleHooks lifecycleHooks; + private MachineSpecLifecycleHooks lifecycleHooks; @JsonProperty("metadata") - private io.fabric8.openshift.api.model.machine.v1beta1.ObjectMeta metadata; + private MachineSpecMetadata metadata; @JsonProperty("providerID") private String providerID; @JsonProperty("providerSpec") - private ProviderSpec providerSpec; + private MachineSpecProviderSpec providerSpec; @JsonProperty("taints") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List taints = new ArrayList<>(); + private List taints = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -81,7 +81,7 @@ public class MachineSpec implements Editable , KubernetesRes public MachineSpec() { } - public MachineSpec(LifecycleHooks lifecycleHooks, io.fabric8.openshift.api.model.machine.v1beta1.ObjectMeta metadata, String providerID, ProviderSpec providerSpec, List taints) { + public MachineSpec(MachineSpecLifecycleHooks lifecycleHooks, MachineSpecMetadata metadata, String providerID, MachineSpecProviderSpec providerSpec, List taints) { super(); this.lifecycleHooks = lifecycleHooks; this.metadata = metadata; @@ -91,22 +91,22 @@ public MachineSpec(LifecycleHooks lifecycleHooks, io.fabric8.openshift.api.model } @JsonProperty("lifecycleHooks") - public LifecycleHooks getLifecycleHooks() { + public MachineSpecLifecycleHooks getLifecycleHooks() { return lifecycleHooks; } @JsonProperty("lifecycleHooks") - public void setLifecycleHooks(LifecycleHooks lifecycleHooks) { + public void setLifecycleHooks(MachineSpecLifecycleHooks lifecycleHooks) { this.lifecycleHooks = lifecycleHooks; } @JsonProperty("metadata") - public io.fabric8.openshift.api.model.machine.v1beta1.ObjectMeta getMetadata() { + public MachineSpecMetadata getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.openshift.api.model.machine.v1beta1.ObjectMeta metadata) { + public void setMetadata(MachineSpecMetadata metadata) { this.metadata = metadata; } @@ -121,23 +121,23 @@ public void setProviderID(String providerID) { } @JsonProperty("providerSpec") - public ProviderSpec getProviderSpec() { + public MachineSpecProviderSpec getProviderSpec() { return providerSpec; } @JsonProperty("providerSpec") - public void setProviderSpec(ProviderSpec providerSpec) { + public void setProviderSpec(MachineSpecProviderSpec providerSpec) { this.providerSpec = providerSpec; } @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; } diff --git a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/LifecycleHook.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSpecLHPreDrain.java similarity index 90% rename from kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/LifecycleHook.java rename to kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSpecLHPreDrain.java index fa99b2cf2df..676e948d725 100644 --- a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/LifecycleHook.java +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSpecLHPreDrain.java @@ -52,7 +52,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class LifecycleHook implements Editable , KubernetesResource +public class MachineSpecLHPreDrain implements Editable , KubernetesResource { @JsonProperty("name") @@ -66,10 +66,10 @@ public class LifecycleHook implements Editable , Kubernete * No args constructor for use in serialization * */ - public LifecycleHook() { + public MachineSpecLHPreDrain() { } - public LifecycleHook(String name, String owner) { + public MachineSpecLHPreDrain(String name, String owner) { super(); this.name = name; this.owner = owner; @@ -96,12 +96,12 @@ public void setOwner(String owner) { } @JsonIgnore - public LifecycleHookBuilder edit() { - return new LifecycleHookBuilder(this); + public MachineSpecLHPreDrainBuilder edit() { + return new MachineSpecLHPreDrainBuilder(this); } @JsonIgnore - public LifecycleHookBuilder toBuilder() { + public MachineSpecLHPreDrainBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSpecLHPreTerminate.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSpecLHPreTerminate.java new file mode 100644 index 00000000000..5df67116509 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSpecLHPreTerminate.java @@ -0,0 +1,122 @@ + +package io.fabric8.openshift.api.model.machine.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", + "owner" +}) +@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 MachineSpecLHPreTerminate implements Editable , KubernetesResource +{ + + @JsonProperty("name") + private String name; + @JsonProperty("owner") + private String owner; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public MachineSpecLHPreTerminate() { + } + + public MachineSpecLHPreTerminate(String name, String owner) { + super(); + this.name = name; + this.owner = owner; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonProperty("owner") + public String getOwner() { + return owner; + } + + @JsonProperty("owner") + public void setOwner(String owner) { + this.owner = owner; + } + + @JsonIgnore + public MachineSpecLHPreTerminateBuilder edit() { + return new MachineSpecLHPreTerminateBuilder(this); + } + + @JsonIgnore + public MachineSpecLHPreTerminateBuilder 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-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/LifecycleHooks.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSpecLifecycleHooks.java similarity index 80% rename from kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/LifecycleHooks.java rename to kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSpecLifecycleHooks.java index 6b5a027d787..bd8376af06a 100644 --- a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/LifecycleHooks.java +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSpecLifecycleHooks.java @@ -54,15 +54,15 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class LifecycleHooks implements Editable , KubernetesResource +public class MachineSpecLifecycleHooks implements Editable , KubernetesResource { @JsonProperty("preDrain") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List preDrain = new ArrayList<>(); + private List preDrain = new ArrayList<>(); @JsonProperty("preTerminate") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List preTerminate = new ArrayList<>(); + private List preTerminate = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -70,10 +70,10 @@ public class LifecycleHooks implements Editable , Kuberne * No args constructor for use in serialization * */ - public LifecycleHooks() { + public MachineSpecLifecycleHooks() { } - public LifecycleHooks(List preDrain, List preTerminate) { + public MachineSpecLifecycleHooks(List preDrain, List preTerminate) { super(); this.preDrain = preDrain; this.preTerminate = preTerminate; @@ -81,33 +81,33 @@ public LifecycleHooks(List preDrain, List preTermi @JsonProperty("preDrain") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getPreDrain() { + public List getPreDrain() { return preDrain; } @JsonProperty("preDrain") - public void setPreDrain(List preDrain) { + public void setPreDrain(List preDrain) { this.preDrain = preDrain; } @JsonProperty("preTerminate") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getPreTerminate() { + public List getPreTerminate() { return preTerminate; } @JsonProperty("preTerminate") - public void setPreTerminate(List preTerminate) { + public void setPreTerminate(List preTerminate) { this.preTerminate = preTerminate; } @JsonIgnore - public LifecycleHooksBuilder edit() { - return new LifecycleHooksBuilder(this); + public MachineSpecLifecycleHooksBuilder edit() { + return new MachineSpecLifecycleHooksBuilder(this); } @JsonIgnore - public LifecycleHooksBuilder toBuilder() { + public MachineSpecLifecycleHooksBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/ObjectMeta.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSpecMetadata.java similarity index 90% rename from kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/ObjectMeta.java rename to kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSpecMetadata.java index d18a28eb591..1347991ed18 100644 --- a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/ObjectMeta.java +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSpecMetadata.java @@ -19,6 +19,7 @@ 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.OwnerReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; @@ -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), @@ -58,7 +59,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ObjectMeta implements Editable , KubernetesResource +public class MachineSpecMetadata implements Editable , KubernetesResource { @JsonProperty("annotations") @@ -83,10 +84,10 @@ public class ObjectMeta implements Editable , KubernetesResou * No args constructor for use in serialization * */ - public ObjectMeta() { + public MachineSpecMetadata() { } - public ObjectMeta(Map annotations, String generateName, Map labels, String name, String namespace, List ownerReferences) { + public MachineSpecMetadata(Map annotations, String generateName, Map labels, String name, String namespace, List ownerReferences) { super(); this.annotations = annotations; this.generateName = generateName; @@ -160,12 +161,12 @@ public void setOwnerReferences(List ownerReferences) { } @JsonIgnore - public ObjectMetaBuilder edit() { - return new ObjectMetaBuilder(this); + public MachineSpecMetadataBuilder edit() { + return new MachineSpecMetadataBuilder(this); } @JsonIgnore - public ObjectMetaBuilder toBuilder() { + public MachineSpecMetadataBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSpecProviderSpec.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSpecProviderSpec.java new file mode 100644 index 00000000000..6d5877c606c --- /dev/null +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSpecProviderSpec.java @@ -0,0 +1,110 @@ + +package io.fabric8.openshift.api.model.machine.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({ + "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 MachineSpecProviderSpec implements Editable , KubernetesResource +{ + + @JsonProperty("value") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + private Object value; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public MachineSpecProviderSpec() { + } + + public MachineSpecProviderSpec(Object value) { + super(); + this.value = value; + } + + @JsonProperty("value") + public Object getValue() { + return value; + } + + @JsonProperty("value") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + public void setValue(Object value) { + this.value = value; + } + + @JsonIgnore + public MachineSpecProviderSpecBuilder edit() { + return new MachineSpecProviderSpecBuilder(this); + } + + @JsonIgnore + public MachineSpecProviderSpecBuilder 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-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSpecTaints.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSpecTaints.java new file mode 100644 index 00000000000..a1e695c867d --- /dev/null +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSpecTaints.java @@ -0,0 +1,150 @@ + +package io.fabric8.openshift.api.model.machine.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({ + "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 MachineSpecTaints 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 MachineSpecTaints() { + } + + public MachineSpecTaints(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 MachineSpecTaintsBuilder edit() { + return new MachineSpecTaintsBuilder(this); + } + + @JsonIgnore + public MachineSpecTaintsBuilder 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-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineStatus.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineStatus.java index 26d368fe4c1..d9011658fd2 100644 --- a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineStatus.java +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineStatus.java @@ -21,6 +21,7 @@ import io.fabric8.kubernetes.api.model.LocalObjectReference; import io.fabric8.kubernetes.api.model.NodeAddress; import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.ResourceRequirements; @@ -56,7 +57,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) }) @@ -69,24 +70,24 @@ public class MachineStatus implements Editable , Kubernete private List addresses = new ArrayList<>(); @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List conditions = new ArrayList<>(); + private List conditions = new ArrayList<>(); @JsonProperty("errorMessage") - private java.lang.String errorMessage; + private String errorMessage; @JsonProperty("errorReason") - private java.lang.String errorReason; + private String errorReason; @JsonProperty("lastOperation") - private LastOperation lastOperation; + private MachineStatusLastOperation lastOperation; @JsonProperty("lastUpdated") - private java.lang.String lastUpdated; + private String lastUpdated; @JsonProperty("nodeRef") - private io.fabric8.kubernetes.api.model.ObjectReference nodeRef; + private MachineStatusNodeRef nodeRef; @JsonProperty("phase") - private java.lang.String phase; + private String phase; @JsonProperty("providerStatus") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Map providerStatus = new LinkedHashMap<>(); + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + private Object providerStatus; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -95,7 +96,7 @@ public class MachineStatus implements Editable , Kubernete public MachineStatus() { } - public MachineStatus(List addresses, List conditions, java.lang.String errorMessage, java.lang.String errorReason, LastOperation lastOperation, java.lang.String lastUpdated, io.fabric8.kubernetes.api.model.ObjectReference nodeRef, java.lang.String phase, Map providerStatus) { + public MachineStatus(List addresses, List conditions, String errorMessage, String errorReason, MachineStatusLastOperation lastOperation, String lastUpdated, MachineStatusNodeRef nodeRef, String phase, Object providerStatus) { super(); this.addresses = addresses; this.conditions = conditions; @@ -121,83 +122,83 @@ public void setAddresses(List addresses) { @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("errorMessage") - public java.lang.String getErrorMessage() { + public String getErrorMessage() { return errorMessage; } @JsonProperty("errorMessage") - public void setErrorMessage(java.lang.String errorMessage) { + public void setErrorMessage(String errorMessage) { this.errorMessage = errorMessage; } @JsonProperty("errorReason") - public java.lang.String getErrorReason() { + public String getErrorReason() { return errorReason; } @JsonProperty("errorReason") - public void setErrorReason(java.lang.String errorReason) { + public void setErrorReason(String errorReason) { this.errorReason = errorReason; } @JsonProperty("lastOperation") - public LastOperation getLastOperation() { + public MachineStatusLastOperation getLastOperation() { return lastOperation; } @JsonProperty("lastOperation") - public void setLastOperation(LastOperation lastOperation) { + public void setLastOperation(MachineStatusLastOperation lastOperation) { this.lastOperation = lastOperation; } @JsonProperty("lastUpdated") - public java.lang.String getLastUpdated() { + public String getLastUpdated() { return lastUpdated; } @JsonProperty("lastUpdated") - public void setLastUpdated(java.lang.String lastUpdated) { + public void setLastUpdated(String lastUpdated) { this.lastUpdated = lastUpdated; } @JsonProperty("nodeRef") - public io.fabric8.kubernetes.api.model.ObjectReference getNodeRef() { + public MachineStatusNodeRef getNodeRef() { return nodeRef; } @JsonProperty("nodeRef") - public void setNodeRef(io.fabric8.kubernetes.api.model.ObjectReference nodeRef) { + public void setNodeRef(MachineStatusNodeRef nodeRef) { this.nodeRef = nodeRef; } @JsonProperty("phase") - public java.lang.String getPhase() { + public String getPhase() { return phase; } @JsonProperty("phase") - public void setPhase(java.lang.String phase) { + public void setPhase(String phase) { this.phase = phase; } @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; } @@ -212,16 +213,16 @@ public MachineStatusBuilder 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-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/Condition.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineStatusConditions.java similarity index 91% rename from kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/Condition.java rename to kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineStatusConditions.java index b34a0616dc5..112375918de 100644 --- a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/Condition.java +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineStatusConditions.java @@ -56,7 +56,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class Condition implements Editable , KubernetesResource +public class MachineStatusConditions implements Editable , KubernetesResource { @JsonProperty("lastTransitionTime") @@ -78,10 +78,10 @@ public class Condition implements Editable , KubernetesResourc * No args constructor for use in serialization * */ - public Condition() { + public MachineStatusConditions() { } - public Condition(String lastTransitionTime, String message, String reason, String severity, String status, String type) { + public MachineStatusConditions(String lastTransitionTime, String message, String reason, String severity, String status, String type) { super(); this.lastTransitionTime = lastTransitionTime; this.message = message; @@ -152,12 +152,12 @@ public void setType(String type) { } @JsonIgnore - public ConditionBuilder edit() { - return new ConditionBuilder(this); + public MachineStatusConditionsBuilder edit() { + return new MachineStatusConditionsBuilder(this); } @JsonIgnore - public ConditionBuilder toBuilder() { + public MachineStatusConditionsBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/LastOperation.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineStatusLastOperation.java similarity index 90% rename from kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/LastOperation.java rename to kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineStatusLastOperation.java index f86c8f3cb50..1c6817e0f41 100644 --- a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/LastOperation.java +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineStatusLastOperation.java @@ -54,7 +54,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class LastOperation implements Editable , KubernetesResource +public class MachineStatusLastOperation implements Editable , KubernetesResource { @JsonProperty("description") @@ -72,10 +72,10 @@ public class LastOperation implements Editable , Kubernete * No args constructor for use in serialization * */ - public LastOperation() { + public MachineStatusLastOperation() { } - public LastOperation(String description, String lastUpdated, String state, String type) { + public MachineStatusLastOperation(String description, String lastUpdated, String state, String type) { super(); this.description = description; this.lastUpdated = lastUpdated; @@ -124,12 +124,12 @@ public void setType(String type) { } @JsonIgnore - public LastOperationBuilder edit() { - return new LastOperationBuilder(this); + public MachineStatusLastOperationBuilder edit() { + return new MachineStatusLastOperationBuilder(this); } @JsonIgnore - public LastOperationBuilder toBuilder() { + public MachineStatusLastOperationBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineStatusNodeRef.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineStatusNodeRef.java new file mode 100644 index 00000000000..29ad12200a0 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineStatusNodeRef.java @@ -0,0 +1,192 @@ + +package io.fabric8.openshift.api.model.machine.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({ + "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 MachineStatusNodeRef 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 MachineStatusNodeRef() { + } + + public MachineStatusNodeRef(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 MachineStatusNodeRefBuilder edit() { + return new MachineStatusNodeRefBuilder(this); + } + + @JsonIgnore + public MachineStatusNodeRefBuilder 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-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/ProviderSpec.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/ProviderSpec.java deleted file mode 100644 index a43ee42fd13..00000000000 --- a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/ProviderSpec.java +++ /dev/null @@ -1,110 +0,0 @@ - -package io.fabric8.openshift.api.model.machine.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({ - "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 ProviderSpec implements Editable , KubernetesResource -{ - - @JsonProperty("value") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Map value = new LinkedHashMap<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ProviderSpec() { - } - - public ProviderSpec(Map value) { - super(); - this.value = value; - } - - @JsonProperty("value") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public Map getValue() { - return value; - } - - @JsonProperty("value") - public void setValue(Map value) { - this.value = value; - } - - @JsonIgnore - public ProviderSpecBuilder edit() { - return new ProviderSpecBuilder(this); - } - - @JsonIgnore - public ProviderSpecBuilder 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-machine/src/test/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetTest.java b/kubernetes-model-generator/openshift-model-machine/src/test/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetTest.java index ed17d34eac1..8b44d45ab46 100644 --- a/kubernetes-model-generator/openshift-model-machine/src/test/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetTest.java +++ b/kubernetes-model-generator/openshift-model-machine/src/test/java/io/fabric8/openshift/api/model/machine/v1/ControlPlaneMachineSetTest.java @@ -17,15 +17,16 @@ import com.fasterxml.jackson.databind.ObjectMapper; import io.fabric8.kubernetes.api.model.Namespaced; +import io.fabric8.kubernetes.model.util.Helper; import io.fabric8.openshift.api.model.machine.v1alpha1.OpenstackProviderSpec; import io.fabric8.openshift.api.model.machine.v1alpha1.OpenstackProviderSpecBuilder; +import org.assertj.core.api.InstanceOfAssertFactories; import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.Collections; import java.util.HashMap; import java.util.Map; -import java.util.Scanner; import static org.assertj.core.api.Assertions.assertThat; @@ -40,14 +41,10 @@ void isNamespaceScoped() { @Test void deserializationAndSerializationShouldWorkAsExpected() throws IOException { // Given - String originalJson = new Scanner(getClass().getResourceAsStream("/test-controlplanemachineset.json")) - .useDelimiter("\\A") - .next(); - + final String originalJson = Helper.loadJson("/test-controlplanemachineset.json"); // When final ControlPlaneMachineSet controlPlaneMachineSet = mapper.readValue(originalJson, ControlPlaneMachineSet.class); final String serializedJson = mapper.writeValueAsString(controlPlaneMachineSet); - // Then assertThat(serializedJson).isNotNull(); assertThat(controlPlaneMachineSet) @@ -57,46 +54,47 @@ void deserializationAndSerializationShouldWorkAsExpected() throws IOException { .hasFieldOrPropertyWithValue("selector.matchLabels", Collections.singletonMap("machine.openshift.io/cluster-api-machine-type", "master")) .hasFieldOrPropertyWithValue("state", "Active") - .hasFieldOrPropertyWithValue("template.machineType", "machines_v1beta1_machine_openshift_io") - .hasFieldOrPropertyWithValue("template.machinesV1beta1MachineOpenshiftIo.failureDomains.openstack", - Collections.singletonList(new OpenStackFailureDomainBuilder() + .extracting(ControlPlaneMachineSetSpec::getTemplate) + .hasFieldOrPropertyWithValue("machineType", "machines_v1beta1_machine_openshift_io") + .extracting(ControlPlaneMachineSetSpecTemplate::getMachines_v1beta1_machine_openshift_io) + .hasFieldOrPropertyWithValue("failureDomains.openstack", + Collections.singletonList(new ControlPlaneMachineSetSpecTMFDOpenstackBuilder() .withAvailabilityZone("nova-one") .withNewRootVolume() .withAvailabilityZone("cinder-one") .endRootVolume() .build())) - .hasFieldOrPropertyWithValue("template.machinesV1beta1MachineOpenshiftIo.metadata.labels", + .hasFieldOrPropertyWithValue("metadata.labels", Collections.singletonMap("machine.openshift.io/cluster-api-machine-type", "master")) - .hasFieldOrPropertyWithValue("template.machinesV1beta1MachineOpenshiftIo.spec.providerSpec.value.apiVersion", + .extracting(ControlPlaneMachineSetSpecTMachines_v1beta1_machine_openshift_io::getSpec) + .extracting(ControlPlaneMachineSetSpecTMSpec::getProviderSpec) + .extracting(ControlPlaneMachineSetSpecTMSpecProviderSpec::getValue) + .hasFieldOrPropertyWithValue("apiVersion", "machine.openshift.io/v1alpha1") - .hasFieldOrPropertyWithValue("template.machinesV1beta1MachineOpenshiftIo.spec.providerSpec.value.kind", + .hasFieldOrPropertyWithValue("kind", "OpenstackProviderSpec") - .hasFieldOrPropertyWithValue("template.machinesV1beta1MachineOpenshiftIo.spec.providerSpec.value.cloudName", + .hasFieldOrPropertyWithValue("cloudName", "openstack") - .hasFieldOrPropertyWithValue("template.machinesV1beta1MachineOpenshiftIo.spec.providerSpec.value.cloudsSecret.name", + .hasFieldOrPropertyWithValue("cloudsSecret.name", "openstack-cloud-credentials") .hasFieldOrPropertyWithValue( - "template.machinesV1beta1MachineOpenshiftIo.spec.providerSpec.value.cloudsSecret.namespace", + "cloudsSecret.namespace", "openshift-machine-api") - .hasFieldOrPropertyWithValue("template.machinesV1beta1MachineOpenshiftIo.spec.providerSpec.value.flavor", "m1.xlarge") - .hasFieldOrPropertyWithValue("template.machinesV1beta1MachineOpenshiftIo.spec.providerSpec.value.rootVolume.diskSize", - 30) - .hasFieldOrPropertyWithValue("template.machinesV1beta1MachineOpenshiftIo.spec.providerSpec.value.rootVolume.volumeType", - "performance") - .hasFieldOrPropertyWithValue("template.machinesV1beta1MachineOpenshiftIo.spec.providerSpec.value.serverGroupName", - "ocp1-2g2xs-master") - .hasFieldOrPropertyWithValue("template.machinesV1beta1MachineOpenshiftIo.spec.providerSpec.value.tags", + .hasFieldOrPropertyWithValue("flavor", "m1.xlarge") + .hasFieldOrPropertyWithValue("rootVolume.diskSize", 30) + .hasFieldOrPropertyWithValue("rootVolume.volumeType", "performance") + .hasFieldOrPropertyWithValue("serverGroupName", "ocp1-2g2xs-master") + .hasFieldOrPropertyWithValue("tags", Collections.singletonList("openshiftClusterID=ocp1-2g2xs")) - .hasFieldOrPropertyWithValue("template.machinesV1beta1MachineOpenshiftIo.spec.providerSpec.value.trunk", true) - .hasFieldOrPropertyWithValue("template.machinesV1beta1MachineOpenshiftIo.spec.providerSpec.value.userDataSecret.name", - "master-user-data") - .satisfies(c -> assertThat( - c.getTemplate().getMachinesV1beta1MachineOpenshiftIo().getSpec().getProviderSpec().getValue().get("securityGroups")) - .asList() + .hasFieldOrPropertyWithValue("trunk", true) + .hasFieldOrPropertyWithValue("userDataSecret.name", "master-user-data") + .satisfies(v -> assertThat(v) + .extracting("securityGroups") + .asInstanceOf(InstanceOfAssertFactories.list(String.class)) .hasSize(1)) - .satisfies(c -> assertThat( - c.getTemplate().getMachinesV1beta1MachineOpenshiftIo().getSpec().getProviderSpec().getValue().get("networks")) - .asList() + .satisfies(v -> assertThat(v) + .extracting("networks") + .asInstanceOf(InstanceOfAssertFactories.list(String.class)) .hasSize(1)); } @@ -133,7 +131,7 @@ void builder() { .withTrunk(true) .withNewUserDataSecret("master-user-data", "test") .build(); - Map providerValue = mapper.convertValue(openstackProviderSpec, Map.class); + // Map providerValue = mapper.convertValue(openstackProviderSpec, Map.class); ControlPlaneMachineSetBuilder controlPlaneMachineSetBuilder = new ControlPlaneMachineSetBuilder() .withNewMetadata() .withName("cluster") @@ -159,16 +157,14 @@ void builder() { .endMetadata() .withNewSpec() .withNewProviderSpec() - .withValue(providerValue) + .withValue(openstackProviderSpec) .endProviderSpec() .endSpec() .endMachinesV1beta1MachineOpenshiftIo() .endTemplate() .endSpec(); - // When ControlPlaneMachineSet controlPlaneMachineSet = controlPlaneMachineSetBuilder.build(); - // Then assertThat(controlPlaneMachineSet) .hasFieldOrPropertyWithValue("metadata.name", "cluster") @@ -177,44 +173,40 @@ void builder() { .hasFieldOrPropertyWithValue("selector.matchLabels", matchLabels) .hasFieldOrPropertyWithValue("state", "Active") .hasFieldOrPropertyWithValue("template.machineType", "machines_v1beta1_machine_openshift_io") - .hasFieldOrPropertyWithValue("template.machinesV1beta1MachineOpenshiftIo.failureDomains.openstack", - Collections.singletonList(new OpenStackFailureDomainBuilder() + .extracting(ControlPlaneMachineSetSpec::getTemplate) + .extracting(ControlPlaneMachineSetSpecTemplate::getMachines_v1beta1_machine_openshift_io) + .hasFieldOrPropertyWithValue("failureDomains.openstack", + Collections.singletonList(new ControlPlaneMachineSetSpecTMFDOpenstackBuilder() .withAvailabilityZone("nova-one") .withNewRootVolume() .withAvailabilityZone("cinder-one") .endRootVolume() .build())) - .hasFieldOrPropertyWithValue("template.machinesV1beta1MachineOpenshiftIo.metadata.labels", matchLabels) - .hasFieldOrPropertyWithValue("template.machinesV1beta1MachineOpenshiftIo.spec.providerSpec.value.apiVersion", + .hasFieldOrPropertyWithValue("metadata.labels", matchLabels) + .extracting(ControlPlaneMachineSetSpecTMachines_v1beta1_machine_openshift_io::getSpec) + .extracting(ControlPlaneMachineSetSpecTMSpec::getProviderSpec) + .extracting(ControlPlaneMachineSetSpecTMSpecProviderSpec::getValue) + .hasFieldOrPropertyWithValue("apiVersion", "machine.openshift.io/v1alpha1") - .hasFieldOrPropertyWithValue("template.machinesV1beta1MachineOpenshiftIo.spec.providerSpec.value.kind", - "OpenstackProviderSpec") - .hasFieldOrPropertyWithValue("template.machinesV1beta1MachineOpenshiftIo.spec.providerSpec.value.cloudName", - "openstack") - .hasFieldOrPropertyWithValue("template.machinesV1beta1MachineOpenshiftIo.spec.providerSpec.value.cloudsSecret.name", - "openstack-cloud-credentials") - .hasFieldOrPropertyWithValue( - "template.machinesV1beta1MachineOpenshiftIo.spec.providerSpec.value.cloudsSecret.namespace", - "openshift-machine-api") - .hasFieldOrPropertyWithValue("template.machinesV1beta1MachineOpenshiftIo.spec.providerSpec.value.flavor", "m1.xlarge") - .hasFieldOrPropertyWithValue("template.machinesV1beta1MachineOpenshiftIo.spec.providerSpec.value.rootVolume.diskSize", - 30) - .hasFieldOrPropertyWithValue("template.machinesV1beta1MachineOpenshiftIo.spec.providerSpec.value.rootVolume.volumeType", - "performance") - .hasFieldOrPropertyWithValue("template.machinesV1beta1MachineOpenshiftIo.spec.providerSpec.value.serverGroupName", - "ocp1-2g2xs-master") - .hasFieldOrPropertyWithValue("template.machinesV1beta1MachineOpenshiftIo.spec.providerSpec.value.tags", - Collections.singletonList("openshiftClusterID=ocp1-2g2xs")) - .hasFieldOrPropertyWithValue("template.machinesV1beta1MachineOpenshiftIo.spec.providerSpec.value.trunk", true) - .hasFieldOrPropertyWithValue("template.machinesV1beta1MachineOpenshiftIo.spec.providerSpec.value.userDataSecret.name", + .hasFieldOrPropertyWithValue("kind", "OpenstackProviderSpec") + .hasFieldOrPropertyWithValue("cloudName", "openstack") + .hasFieldOrPropertyWithValue("cloudsSecret.name", "openstack-cloud-credentials") + .hasFieldOrPropertyWithValue("cloudsSecret.namespace", "openshift-machine-api") + .hasFieldOrPropertyWithValue("flavor", "m1.xlarge") + .hasFieldOrPropertyWithValue("rootVolume.diskSize", 30) + .hasFieldOrPropertyWithValue("rootVolume.volumeType", "performance") + .hasFieldOrPropertyWithValue("serverGroupName", "ocp1-2g2xs-master") + .hasFieldOrPropertyWithValue("tags", Collections.singletonList("openshiftClusterID=ocp1-2g2xs")) + .hasFieldOrPropertyWithValue("trunk", true) + .hasFieldOrPropertyWithValue("userDataSecret.name", "master-user-data") - .satisfies(c -> assertThat( - c.getTemplate().getMachinesV1beta1MachineOpenshiftIo().getSpec().getProviderSpec().getValue().get("securityGroups")) - .asList() + .satisfies(v -> assertThat(v) + .extracting("securityGroups") + .asInstanceOf(InstanceOfAssertFactories.list(String.class)) .hasSize(1)) - .satisfies(c -> assertThat( - c.getTemplate().getMachinesV1beta1MachineOpenshiftIo().getSpec().getProviderSpec().getValue().get("networks")) - .asList() + .satisfies(v -> assertThat(v) + .extracting("networks") + .asInstanceOf(InstanceOfAssertFactories.list(String.class)) .hasSize(1)); } } diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/MachineHealthCheckTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/MachineHealthCheckTest.java index deed9ab3e5d..cadc7c30c48 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/MachineHealthCheckTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/MachineHealthCheckTest.java @@ -15,7 +15,6 @@ */ package io.fabric8.openshift.client.server.mock; -import io.fabric8.kubernetes.api.model.Duration; import io.fabric8.kubernetes.api.model.IntOrString; import io.fabric8.openshift.api.model.machine.v1beta1.MachineHealthCheck; import io.fabric8.openshift.api.model.machine.v1beta1.MachineHealthCheckBuilder; @@ -92,9 +91,9 @@ private MachineHealthCheck createNewMachineHealthCheck(String name) throws Parse .addToMatchLabels("machine.openshift.io/interruptible-instance", "") .endSelector() .withMaxUnhealthy(new IntOrString("100%")) - .withNodeStartupTimeout(Duration.parse("0s")) + .withNodeStartupTimeout("0s") .addNewUnhealthyCondition() - .withTimeout(Duration.parse("0s")) + .withTimeout("0s") .withStatus("True") .withType("Terminating") .endUnhealthyCondition()