From c6f4cf2afc6f3e1b73f730369bf7cf723825ec75 Mon Sep 17 00:00:00 2001 From: Marc Nuri Date: Thu, 3 Oct 2024 16:00:33 +0200 Subject: [PATCH] refactor: openshift-model-installer generated from OpenAPI schemas Signed-off-by: Marc Nuri --- Makefile | 1 + kubernetes-model-generator/generateModel.sh | 1 - .../openapi/generator/cmd/openapi.go | 14 +- .../openapi/generator/go.mod | 41 +- .../openapi/generator/go.sum | 463 +- .../generator/pkg/openshift/openshift.go | 13 + .../openapi/generator/pkg/parser/parser.go | 26 +- .../generator/tools/generator/openapi.go | 16 +- .../schema/generator/GeneratorSettings.java | 11 + .../generator/model/ModelGenerator.java | 3 +- .../schema/generator/schema/SchemaUtils.java | 8 +- .../schema/generator/SchemaUtilsTest.java | 12 +- .../openapi/schemas/openshift-generated.json | 4228 ++++++++++++++++- .../openshift-model-installer/Makefile | 27 - .../cmd/generate/generate.go | 131 - .../openshift-model-installer/pom.xml | 67 +- .../kubernetes/api/model/KubeSchema.java | 272 -- .../api/model/ValidationSchema.java | 272 -- .../model/installer/aws/v1/MachinePool.java | 32 +- .../v1/Platform.java => aws/v1/Metadata.java} | 134 +- .../api/model/installer/aws/v1/Platform.java | 58 +- .../installer/azure/v1/ConfidentialVM.java | 108 + .../azure/v1/CustomerManagedKey.java | 122 + .../model/installer/azure/v1/KeyVault.java | 136 + .../model/installer/azure/v1/MachinePool.java | 16 +- .../model/installer/azure/v1/Metadata.java | 164 + .../api/model/installer/azure/v1/OSDisk.java | 18 +- .../api/model/installer/azure/v1/OSImage.java | 16 +- .../model/installer/azure/v1/Platform.java | 16 +- .../installer/azure/v1/SecuritySettings.java | 136 + .../installer/azure/v1/TrustedLaunch.java | 108 + .../installer/azure/v1/UEFISettings.java | 122 + .../azure/v1/VMDiskSecurityProfile.java | 122 + .../installer/baremetal/v1/Metadata.java | 136 + .../installer/baremetal/v1/Platform.java | 17 +- .../{libvirt => external}/v1/Platform.java | 58 +- .../model/installer/gcp/v1/MachinePool.java | 30 +- .../api/model/installer/gcp/v1/Metadata.java | 150 + .../api/model/installer/gcp/v1/Metric.java | 138 + .../api/model/installer/gcp/v1/OSImage.java | 122 + .../api/model/installer/gcp/v1/Platform.java | 66 +- .../model/installer/gcp/v1/QuotaUsage.java | 152 + .../v1/UserLabel.java} | 34 +- .../api/model/installer/gcp/v1/UserTag.java | 136 + .../installer/ibmcloud/v1/EndpointsJSON.java | 248 + .../ibmcloud/v1/EndpointsVisibility.java | 126 + .../model/installer/ibmcloud/v1/Metadata.java | 227 + .../model/installer/ibmcloud/v1/Platform.java | 19 +- .../model/installer/nutanix/v1/DataDisk.java | 152 + .../installer/nutanix/v1/FailureDomain.java | 172 + .../installer/nutanix/v1/MachinePool.java | 51 +- .../model/installer/nutanix/v1/Metadata.java | 150 + .../v1/MetadataCloudInit.java} | 37 +- .../model/installer/nutanix/v1/Platform.java | 18 +- .../installer/nutanix/v1/StorageConfig.java | 122 + .../nutanix/v1/StorageResourceReference.java | 136 + .../model/installer/openstack/v1/FixedIP.java | 1 - .../installer/openstack/v1/MachinePool.java | 18 +- .../installer/openstack/v1/Metadata.java | 124 + .../installer/openstack/v1/Platform.java | 16 +- .../{NamedPortTarget.java => PortTarget.java} | 26 +- .../installer/openstack/v1/RootVolume.java | 18 +- .../installer/openstack/v1/SubnetFilter.java | 122 + .../model/installer/ovirt/v1/Metadata.java | 122 + .../model/installer/ovirt/v1/Platform.java | 86 +- .../installer/powervs/v1/MachinePool.java | 25 +- .../model/installer/powervs/v1/Metadata.java | 239 + .../model/installer/powervs/v1/Platform.java | 81 +- .../v1/Region.java} | 120 +- .../model/installer/v1/ClusterMetadata.java | 306 ++ .../installer/v1/ClusterNetworkEntry.java | 1 + .../installer/v1/ClusterPlatformMetadata.java | 235 + .../api/model/installer/v1/ClusterQuota.java | 113 + .../ImageDigestSource.java} | 54 +- .../api/model/installer/v1/InstallConfig.java | 57 +- .../installer/v1/MachineNetworkEntry.java | 1 + .../installer/v1/MachinePoolPlatform.java | 37 +- .../api/model/installer/v1/Networking.java | 37 +- .../v1/OperatorPublishingStrategy.java | 122 + .../api/model/installer/v1/Platform.java | 44 +- .../api/model/installer/vsphere/v1/Host.java | 136 + .../v1/Metadata.java} | 104 +- .../vsphere/v1/NetworkDeviceSpec.java | 142 + .../model/installer/vsphere/v1/Platform.java | 33 +- .../model/installer/vsphere/v1/Topology.java | 34 +- .../model/installer/vsphere/v1/VCenters.java | 136 + kubernetes-model-generator/pom.xml | 1 + 87 files changed, 10732 insertions(+), 1270 deletions(-) delete mode 100644 kubernetes-model-generator/openshift-model-installer/Makefile delete mode 100644 kubernetes-model-generator/openshift-model-installer/cmd/generate/generate.go delete mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java delete mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java rename kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/{alibabacloud/v1/Platform.java => aws/v1/Metadata.java} (56%) create mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/ConfidentialVM.java create mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/CustomerManagedKey.java create mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/KeyVault.java create mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/Metadata.java create mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/SecuritySettings.java create mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/TrustedLaunch.java create mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/UEFISettings.java create mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/VMDiskSecurityProfile.java create mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/baremetal/v1/Metadata.java rename kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/{libvirt => external}/v1/Platform.java (72%) create mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/gcp/v1/Metadata.java create mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/gcp/v1/Metric.java create mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/gcp/v1/OSImage.java create mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/gcp/v1/QuotaUsage.java rename kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/{libvirt/v1/DnsmasqOption.java => gcp/v1/UserLabel.java} (83%) create mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/gcp/v1/UserTag.java create mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/ibmcloud/v1/EndpointsJSON.java create mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/ibmcloud/v1/EndpointsVisibility.java create mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/ibmcloud/v1/Metadata.java create mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/DataDisk.java create mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/FailureDomain.java create mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/Metadata.java rename kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/{libvirt/v1/MachinePool.java => nutanix/v1/MetadataCloudInit.java} (77%) create mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/StorageConfig.java create mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/StorageResourceReference.java create mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/Metadata.java rename kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/{NamedPortTarget.java => PortTarget.java} (86%) create mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/SubnetFilter.java create mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/ovirt/v1/Metadata.java create mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/powervs/v1/Metadata.java rename kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/{alibabacloud/v1/MachinePool.java => powervs/v1/Region.java} (58%) create mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/ClusterMetadata.java create mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/ClusterPlatformMetadata.java create mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/ClusterQuota.java rename kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/{libvirt/v1/Network.java => v1/ImageDigestSource.java} (74%) create mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/OperatorPublishingStrategy.java create mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/vsphere/v1/Host.java rename kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/{openstack/v1/FailureDomain.java => vsphere/v1/Metadata.java} (58%) create mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/vsphere/v1/NetworkDeviceSpec.java create mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/vsphere/v1/VCenters.java diff --git a/Makefile b/Makefile index 15b50b0d158..c58b6cb527c 100644 --- a/Makefile +++ b/Makefile @@ -78,6 +78,7 @@ openapi-generate-java-classes: cd kubernetes-model-generator/openshift-model-whereabouts && mvn -Pgenerate clean install cd kubernetes-model-generator/openshift-model-storageversionmigrator && mvn -Pgenerate clean install cd kubernetes-model-generator/openshift-model-hive && mvn -Pgenerate clean install + cd kubernetes-model-generator/openshift-model-installer && 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 1fdec32a625..30cf1cd316f 100755 --- a/kubernetes-model-generator/generateModel.sh +++ b/kubernetes-model-generator/generateModel.sh @@ -22,7 +22,6 @@ ABSOLUTE_BASEDIR=$(realpath "$BASEDIR") # Array for all existing modules declare -a modules=( - "openshift-model-installer" "../extensions/knative/generator" "../extensions/certmanager/generator-v1" "../extensions/certmanager/generator-v1alpha2" diff --git a/kubernetes-model-generator/openapi/generator/cmd/openapi.go b/kubernetes-model-generator/openapi/generator/cmd/openapi.go index 8859a2de32e..d564280526e 100644 --- a/kubernetes-model-generator/openapi/generator/cmd/openapi.go +++ b/kubernetes-model-generator/openapi/generator/cmd/openapi.go @@ -22,12 +22,15 @@ import ( "github.com/fabric8io/kubernetes-client/kubernetes-model-generator/openapi/generator/pkg/openapi" "github.com/fabric8io/kubernetes-client/kubernetes-model-generator/openapi/generator/pkg/openshift" "github.com/fabric8io/kubernetes-client/kubernetes-model-generator/openapi/generator/pkg/parser" + "strings" + //openshiftbaremetaloperatorv1alpha1 "github.com/metal3-io/baremetal-operator/apis/metal3.io/v1alpha1" openshiftconfigv1 "github.com/openshift/api/config/v1" openshiftcloudcredentialoperatorv1 "github.com/openshift/cloud-credential-operator/pkg/apis/cloudcredential/v1" openshiftclusternetworkoperatorv1 "github.com/openshift/cluster-network-operator/pkg/apis/network/v1" openshiftclusternodetuningoperatorv1 "github.com/openshift/cluster-node-tuning-operator/pkg/apis/tuned/v1" openshifthivev1 "github.com/openshift/hive/apis/hive/v1" + openshiftinstallerv1 "github.com/openshift/installer/pkg/types" operatorframeworkv1 "github.com/operator-framework/api/pkg/operators/v1" operatorframeworkv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1" olm "github.com/operator-framework/operator-lifecycle-manager/pkg/package-server/apis/operators/v1" @@ -50,19 +53,20 @@ func init() { var openApiRun = func(cobraCmd *cobra.Command, args []string) { startTime := time.Now() - fmt.Printf("OpenAPI JSON schema generation started...\n%s\n", []string{ + fmt.Printf("OpenAPI JSON schema generation started...\n%s\n", strings.Join([]string{ // Force imports so that modules are present in go.mod openshiftconfigv1.SchemeGroupVersion.String(), //openshiftbaremetaloperatorv1alpha1.GroupVersion.String(), - operatorframeworkv1alpha1.SchemeGroupVersion.String(), - operatorframeworkv1.GroupVersion.String(), + olm.SchemeGroupVersion.String(), openshiftcloudcredentialoperatorv1.GroupVersion.String(), openshiftclusternetworkoperatorv1.GroupVersion.String(), openshiftclusternodetuningoperatorv1.SchemeGroupVersion.String(), openshifthivev1.SchemeGroupVersion.String(), - olm.SchemeGroupVersion.String(), + "install.openshift.io/" + openshiftinstallerv1.InstallConfigVersion + "(" + strings.Join(openshiftinstallerv1.PlatformNames, ",") + ")", + operatorframeworkv1alpha1.SchemeGroupVersion.String(), + operatorframeworkv1.GroupVersion.String(), prometheusoperatorv1.SchemeGroupVersion.String(), - }) + }, "\n")) var targetDirectory string if len(args) > 0 { targetDirectory = args[0] diff --git a/kubernetes-model-generator/openapi/generator/go.mod b/kubernetes-model-generator/openapi/generator/go.mod index 69914dcd6e0..ea1205c7f58 100644 --- a/kubernetes-model-generator/openapi/generator/go.mod +++ b/kubernetes-model-generator/openapi/generator/go.mod @@ -11,6 +11,8 @@ require ( github.com/openshift/cloud-credential-operator v0.0.0-20240910052617-d668c182b0e3 github.com/openshift/cluster-network-operator v0.0.0-20240912134426-a3188633549d github.com/openshift/cluster-node-tuning-operator v0.0.0-20241001165112-1685a8fc1376 + github.com/openshift/hive/apis v0.0.0-20240930213556-2d25383963db + github.com/openshift/installer v0.0.0-00010101000000-000000000000 github.com/operator-framework/api v0.27.0 github.com/operator-framework/operator-lifecycle-manager v0.0.0-00010101000000-000000000000 github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.77.1 @@ -21,7 +23,7 @@ require ( k8s.io/client-go v12.0.0+incompatible k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38 - k8s.io/metrics v0.30.2 + k8s.io/metrics v0.30.3 sigs.k8s.io/gateway-api v1.1.0 sigs.k8s.io/kustomize/api v0.17.2 ) @@ -29,7 +31,11 @@ require ( // Required by some openshift operator dependencies // Force usage of latest Kuberentes Version replace ( + github.com/openshift/assisted-service/api => github.com/openshift/assisted-service/api v0.0.0-20241003070528-341f9860c455 + github.com/openshift/assisted-service/client => github.com/openshift/assisted-service/client v0.0.0-20241003070528-341f9860c455 + github.com/openshift/assisted-service/models => github.com/openshift/assisted-service/models v0.0.0-20241003070528-341f9860c455 github.com/openshift/hive => github.com/openshift/hive v1.1.17-0.20240930213556-2d25383963db // Latest Master + github.com/openshift/installer => github.com/openshift/installer v0.91.0 // Most up-to-date tag https://issues.redhat.com/browse/OCPBUGS-42448 k8s.io/client-go => k8s.io/client-go v0.31.1 k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.1 k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.1 @@ -47,43 +53,71 @@ replace ( github.com/operator-framework/operator-lifecycle-manager => github.com/marcnuri-forks/operator-lifecycle-manager v0.0.0-20241002090802-7539192fbf96 ) -require github.com/openshift/hive/apis v0.0.0-20240930213556-2d25383963db - require ( + github.com/PaesslerAG/gval v1.0.0 // indirect + github.com/PaesslerAG/jsonpath v0.1.1 // indirect github.com/antlr4-go/antlr/v4 v4.13.0 // indirect + github.com/aws/aws-sdk-go v1.53.5 // indirect + github.com/beorn7/perks v1.0.1 // indirect github.com/blang/semver/v4 v4.0.0 // indirect + github.com/cespare/xxhash/v2 v2.3.0 // indirect + github.com/coreos/go-semver v0.3.1 // indirect + github.com/coreos/go-systemd/v22 v22.5.0 // indirect + github.com/coreos/ignition/v2 v2.19.0 // indirect + github.com/coreos/vcontext v0.0.0-20231102161604-685dc7299dc5 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/emicklei/go-restful/v3 v3.12.1 // indirect github.com/fxamacker/cbor/v2 v2.7.0 // indirect github.com/go-errors/errors v1.4.2 // indirect github.com/go-logr/logr v1.4.2 // indirect + github.com/go-logr/zapr v1.3.0 // indirect github.com/go-openapi/jsonpointer v0.21.0 // indirect github.com/go-openapi/jsonreference v0.21.0 // indirect github.com/go-openapi/swag v0.23.0 // indirect github.com/go-test/deep v1.1.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/google/cel-go v0.20.1 // indirect github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect + github.com/google/go-cmp v0.6.0 // indirect github.com/google/gofuzz v1.2.0 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/h2non/filetype v1.1.3 // indirect github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c // indirect + github.com/hashicorp/go-cleanhttp v0.5.2 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/invopop/yaml v0.2.0 // indirect + github.com/jmespath/go-jmespath v0.4.1-0.20220621161143-b0104c826a24 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect + github.com/kdomanski/iso9660 v0.2.1 // indirect + github.com/klauspost/compress v1.17.9 // indirect github.com/mailru/easyjson v0.7.7 // indirect + github.com/mattn/go-sqlite3 v2.0.3+incompatible // indirect + github.com/metal3-io/baremetal-operator/apis v0.4.0 // indirect + github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.4.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect + github.com/nutanix-cloud-native/prism-go-client v0.3.4 // indirect github.com/onsi/gomega v1.34.2 // indirect github.com/openshift/custom-resource-status v1.1.3-0.20220503160415-f2fdb4999d87 // indirect github.com/operator-framework/operator-registry v1.47.0 // indirect github.com/perimeterx/marshmallow v1.1.5 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/prometheus/client_golang v1.20.4 // indirect + github.com/prometheus/client_model v0.6.1 // indirect + github.com/prometheus/common v0.59.1 // indirect + github.com/prometheus/procfs v0.15.1 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace // indirect github.com/stoewer/go-strcase v1.3.0 // indirect + github.com/vincent-petithory/dataurl v1.0.0 // indirect github.com/x448/float16 v0.8.4 // indirect + go.uber.org/multierr v1.11.0 // indirect + go.uber.org/zap v1.27.0 // indirect golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect golang.org/x/mod v0.21.0 // indirect golang.org/x/net v0.29.0 // indirect @@ -94,6 +128,7 @@ require ( golang.org/x/text v0.18.0 // indirect golang.org/x/time v0.6.0 // indirect golang.org/x/tools v0.25.0 // indirect + gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240711142825-46eb208f015d // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240722135656-d784300faade // indirect google.golang.org/grpc v1.66.0 // indirect diff --git a/kubernetes-model-generator/openapi/generator/go.sum b/kubernetes-model-generator/openapi/generator/go.sum index 5be8001e4a9..c2e56717671 100644 --- a/kubernetes-model-generator/openapi/generator/go.sum +++ b/kubernetes-model-generator/openapi/generator/go.sum @@ -1,4 +1,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k= +github.com/99designs/gqlgen v0.15.1 h1:48bRXecwlCNTa/n2bMSp2rQsXNxwZ54QHbiULNf78ec= +github.com/99designs/gqlgen v0.15.1/go.mod h1:nbeSjFkqphIqpZsYe1ULVz0yfH8hjpJdJIQoX/e0G2I= github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 h1:bvDV9vkmnHYOMsOr4WLk+Vo07yKIzd94sVoIqshQ4bU= github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= @@ -9,28 +13,60 @@ github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA github.com/Microsoft/hcsshim v0.12.5 h1:bpTInLlDy/nDRWFVcefDZZ1+U8tS+rz3MxjKgu9boo0= github.com/Microsoft/hcsshim v0.12.5/go.mod h1:tIUGego4G1EN5Hb6KC90aDYiUI2dqLSTTOCjVNpOgZ8= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= +github.com/PaesslerAG/gval v1.0.0 h1:GEKnRwkWDdf9dOmKcNrar9EA1bz1z9DqPIO1+iLzhd8= +github.com/PaesslerAG/gval v1.0.0/go.mod h1:y/nm5yEyTeX6av0OfKJNp9rBNj2XrGhAf5+v24IBN1I= +github.com/PaesslerAG/jsonpath v0.1.0/go.mod h1:4BzmtoM/PI8fPO4aQGIusjGxGir2BzcV0grWtFzq1Y8= +github.com/PaesslerAG/jsonpath v0.1.1 h1:c1/AToHQMVsduPAa4Vh6xp2U0evy4t8SWp8imEsylIk= +github.com/PaesslerAG/jsonpath v0.1.1/go.mod h1:lVboNxFGal/VwW6d9JzIy56bUsYAP6tH/x80vjnCseY= github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= +github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM= +github.com/agnivade/levenshtein v1.1.0 h1:n6qGwyHG61v3ABce1rPVZklEYRT8NFpCMrpZdBUbYGM= +github.com/agnivade/levenshtein v1.1.0/go.mod h1:veldBMzWxcCG2ZvUTKD2kJNRdCk5hVbJomOvKkmgYbo= +github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= +github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/antlr4-go/antlr/v4 v4.13.0 h1:lxCg3LAv+EUK6t1i0y1V6/SLeUi0eKEKdhQAlS8TVTI= github.com/antlr4-go/antlr/v4 v4.13.0/go.mod h1:pfChB/xh/Unjila75QW7+VU4TSnWnnk9UTnmpPaOR2g= +github.com/arbovm/levenshtein v0.0.0-20160628152529-48b4e1c0c4d0/go.mod h1:t2tdKJDJF9BV14lnkjHmOQgcvEKgtqs5a1N3LNdJhGE= +github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so= github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= +github.com/aws/aws-sdk-go v1.42.23/go.mod h1:gyRszuZ/icHmHAVE4gc/r+cfCmhA1AD+vqfWbgI+eHs= +github.com/aws/aws-sdk-go v1.53.5 h1:1OcVWMjGlwt7EU5OWmmEEXqaYfmX581EK317QJZXItM= +github.com/aws/aws-sdk-go v1.53.5/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= +github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM= github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= +github.com/bnkamalesh/webgo/v4 v4.1.11/go.mod h1:taIAonQTzao8G5rnB22WgKmQuIOWHpQ0n/YLAidBXlM= +github.com/bnkamalesh/webgo/v6 v6.2.2/go.mod h1:2Y+dEdTp1xC/ra+3PAVZV6hh4sCI+iPK7mcHt+t9bfM= github.com/bshuster-repo/logrus-logstash-hook v1.0.0 h1:e+C0SB5R1pu//O4MQ3f9cFuPGoOVeF2fE4Og9otCc70= github.com/bshuster-repo/logrus-logstash-hook v1.0.0/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk= github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/chromedp/cdproto v0.0.0-20230802225258-3cf4e6d46a89/go.mod h1:GKljq0VrfU4D5yc+2qA6OVr8pmO/MBbPEWqWQ/oqGEs= +github.com/chromedp/chromedp v0.9.2/go.mod h1:LkSXJKONWTCHAfQasKFUZI+mxqS4tZqhmtGzzhLsnLs= +github.com/chromedp/sysutil v1.0.0/go.mod h1:kgWmDdq8fTzXYcKIBqIYvRRTnYb9aNS9moAV0xufSww= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= +github.com/chzyer/logex v1.2.1/go.mod h1:JLbx6lG2kDbNRFnfkgvh4eRJRPX1QCoOIWomwysCBrQ= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= +github.com/chzyer/readline v1.5.1/go.mod h1:Eh+b79XXUwfKfcPLepksvw2tcLE/Ct21YObkaSkeBlk= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/chzyer/test v1.0.0/go.mod h1:2JlltgoNkt4TW/z9V/IzDdFaMTM2JPIi26O1pF38GC8= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= +github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/containerd/cgroups/v3 v3.0.3 h1:S5ByHZ/h9PMe5IOQoN7E+nMc2UcLEM/V48DGDJ9kip0= github.com/containerd/cgroups/v3 v3.0.3/go.mod h1:8HBe7V3aWGLFPd/k03swSIsGjZhHI2WzJmticMgVuz0= github.com/containerd/containerd v1.7.21 h1:USGXRK1eOC/SX0L195YgxTHb0a00anxajOzgfN0qrCA= @@ -59,17 +95,29 @@ github.com/containers/ocicrypt v1.2.0 h1:X14EgRK3xNFvJEfI5O4Qn4T3E25ANudSOZz/sir github.com/containers/ocicrypt v1.2.0/go.mod h1:ZNviigQajtdlxIZGibvblVuIFBKIuUI2M0QM12SD31U= github.com/containers/storage v1.55.0 h1:wTWZ3YpcQf1F+dSP4KxG9iqDfpQY1otaUXjPpffuhgg= github.com/containers/storage v1.55.0/go.mod h1:28cB81IDk+y7ok60Of6u52RbCeBRucbFOeLunhER1RQ= -github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf h1:iW4rZ826su+pqaw19uhpSCzhj44qo35pNgKFGqzDKkU= +github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4= +github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec= github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= +github.com/coreos/ignition/v2 v2.19.0 h1:ek200E31M1NCVyvL22Bd40kOJp7yt1gdHAb3xwqTi8Y= +github.com/coreos/ignition/v2 v2.19.0/go.mod h1:ydb815SaH9A4304wIUoCS5IHyKRHWEp7dfJH8cQW2gA= +github.com/coreos/vcontext v0.0.0-20231102161604-685dc7299dc5 h1:sMZSC2BW5LKCdvNbfN12SbKrNvtLBUNjfHZmMvI2ItY= +github.com/coreos/vcontext v0.0.0-20231102161604-685dc7299dc5/go.mod h1:Salmysdw7DAVuobBW/LwsKKgpyCPHUhjyJoMJD+ZJiI= +github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/creasty/defaults v1.5.2 h1:/VfB6uxpyp6h0fr7SPp7n8WJBoV8jfxQXPCnkVSjyls= +github.com/creasty/defaults v1.5.2/go.mod h1:FPZ+Y0WNrbqOVw+c6av63eyHUAl6pMHZwqLPvXUZGfY= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc= +github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.0-20210816181553-5444fa50b93d/go.mod h1:tmAIfUFEirG/Y8jhZ9M+h36obRZAk/1fcSpXwAVlfqE= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= +github.com/dgryski/trifles v0.0.0-20200323201526-dd97f9abfb48/go.mod h1:if7Fbed8SFyPtHLHbg49SI7NAdJiC5WIA09pe59rfAA= github.com/distribution/distribution/v3 v3.0.0-beta.1 h1:X+ELTxPuZ1Xe5MsD3kp2wfGUhc8I+MPfRis8dZ818Ic= github.com/distribution/distribution/v3 v3.0.0-beta.1/go.mod h1:O9O8uamhHzWWQVTjuQpyYUVm/ShPHPUDgvQMpHGVBDs= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= @@ -95,53 +143,103 @@ github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkg github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/emicklei/go-restful v2.15.0+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= +github.com/emicklei/go-restful/v3 v3.8.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= +github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/emicklei/go-restful/v3 v3.12.1 h1:PJMDIM/ak7btuL8Ex0iYET9hxM3CI2sjZtzpL63nKAU= github.com/emicklei/go-restful/v3 v3.12.1/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= +github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/evanphx/json-patch v5.9.0+incompatible h1:fBXyNpNMuTTDdquAq/uisOr2lShz4oaXpDTX2bLe7ls= +github.com/evanphx/json-patch v5.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E= github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ= +github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0= +github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk= github.com/getkin/kin-openapi v0.76.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg= github.com/getkin/kin-openapi v0.125.0 h1:jyQCyf2qXS1qvs2U00xQzkGCqYPhEhZDmSmVt65fXno= github.com/getkin/kin-openapi v0.125.0/go.mod h1:wb1aSZA/iWmorQP9KTAS/phLj/t17B5jT7+fS8ed9NM= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= +github.com/gin-gonic/gin v1.7.7/go.mod h1:axIBovoeJpVj8S3BwE0uPMTeReE4+AfFtqpqaZ1qq1U= +github.com/go-chi/chi v1.5.4 h1:QHdzF2szwjqVV4wmByUnTcsbIg7UGaQ0tPF2t5GcAIs= +github.com/go-chi/chi v1.5.4/go.mod h1:uaf8YgoFazUOkPBG7fxPftUylNumIev9awIWOENIuEg= +github.com/go-chi/cors v1.2.0/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58= +github.com/go-chi/render v1.0.1 h1:4/5tis2cKaNdnv9zFLfXzcquC9HbeZgCnxGnKrltBS8= +github.com/go-chi/render v1.0.1/go.mod h1:pq4Rr7HbnsdaeHagklXub+p6Wd16Af5l9koip1OvJns= github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA= github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= +github.com/go-logr/zapr v1.2.3/go.mod h1:eIauM6P8qSvTw5o2ez6UEAfGjQKrxQTl5EoK+Qa2oG4= +github.com/go-logr/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ= +github.com/go-logr/zapr v1.3.0/go.mod h1:YKepepNBd1u/oyhd/yQmtjVXmm9uML4IXUgMOwR8/Gg= github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= +github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs= github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ= github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY= github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8= github.com/go-openapi/jsonreference v0.19.5/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg= github.com/go-openapi/jsonreference v0.19.6/go.mod h1:diGHMEHg2IqXZGKxqyvWdfWU/aim5Dprw5bqpKkTvns= +github.com/go-openapi/jsonreference v0.20.1/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k= +github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k= github.com/go-openapi/jsonreference v0.21.0 h1:Rs+Y7hSXT83Jacb7kFyjn4ijOuVGSvOdF2+tg1TRrwQ= github.com/go-openapi/jsonreference v0.21.0/go.mod h1:LmZmgsrTkVg9LG4EaHeY8cBDslNPMo06cago5JNLkm4= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= github.com/go-openapi/swag v0.21.1/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= +github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= +github.com/go-openapi/swag v0.22.4/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE= github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ= +github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= +github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= +github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs= +github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= +github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= +github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= +github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA= +github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= +github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= +github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4= +github.com/go-playground/validator/v10 v10.10.1/go.mod h1:i+3WkQ1FvaUjjxh1kSvIA4dMGDBiPU55YFDl0WbKdWU= +github.com/go-playground/validator/v10 v10.19.0 h1:ol+5Fu+cSq9JD7SoSqe04GMI92cbn0+wvQ3bZ8b/AU4= +github.com/go-playground/validator/v10 v10.19.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= +github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= +github.com/go-test/deep v1.0.8/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE= github.com/go-test/deep v1.1.1 h1:0r/53hagsehfO4bzD2Pgr/+RgHqhmf+k1Bpse2cTu1U= github.com/go-test/deep v1.1.1/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE= +github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM= +github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= +github.com/gobwas/ws v1.2.1/go.mod h1:hRKAFb8wOxFROYNsT1bqfWnhX+b5MFeJM9r2ZSwg/KY= +github.com/goccy/go-json v0.9.4/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= github.com/golang-migrate/migrate/v4 v4.17.1 h1:4zQ6iqL6t6AiItphxJctQb3cFqWiSpMnX7wLTPnnYO4= github.com/golang-migrate/migrate/v4 v4.17.1/go.mod h1:m8hinFyWBn0SA4QKHuKh175Pm9wjmxj3S2Mia7dbXzM= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -150,6 +248,7 @@ github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4er github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= @@ -157,19 +256,28 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= +github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= github.com/google/cel-go v0.20.1 h1:nDx9r8S3L4pE61eDdt8igGj8rf5kjYR3ILxWIpWNi84= github.com/google/cel-go v0.20.1/go.mod h1:kWcIzTsPX0zmQ+H3TirHstLLf9ep5QTsZBN9u4dOYLg= +github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ= +github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U= github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 h1:0VpGH+cDhbDtdcweoyCVsF3fhN8kejK6rFe/2FFX2nU= github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49/go.mod h1:BkkQ4L1KS1xMt2aWSPStnn55ChGC0DPOn2FQYj+f25M= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= @@ -178,9 +286,12 @@ github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/ github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw= +github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo= github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5 h1:5iH8iuqE5apketRbSFBy+X1V0o+l+8NF1avt4HWl7cA= github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2cUuW7uA/OeU= @@ -191,42 +302,83 @@ github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB7 github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= +github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 h1:bkypFPDjIYGfCYD5mRBvpqxfYX1YCS1PXdKYWi8FsN0= github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0/go.mod h1:P+Lt/0by1T8bfcF3z737NnSbmxQAppXMRziHUxPOC8k= github.com/h2non/filetype v1.1.3 h1:FKkx9QbD7HR/zjK1Ia5XiBsq9zdLi5Kf3zGyFTAFkGg= github.com/h2non/filetype v1.1.3/go.mod h1:319b3zT68BvV+WRj7cwy856M2ehB3HqNOt6sy1HndBY= github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c h1:fEE5/5VNnYUoBOj2I9TP8Jc+a7lge3QWn9DKE7NCwfc= github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c/go.mod h1:ObS/W+h8RYb1Y7fYivughjxojTmIu5iAIjSrSLCLeqE= +github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= +github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= +github.com/hashicorp/golang-lru v0.5.0 h1:CL2msUPvZTLb5O648aiLNJw3hnBxN2+1Jq8rCOH9wdo= +github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru/arc/v2 v2.0.5 h1:l2zaLDubNhW4XO3LnliVj0GXO3+/CGNJAg1dcN2Fpfw= github.com/hashicorp/golang-lru/arc/v2 v2.0.5/go.mod h1:ny6zBSQZi2JxIeYcv7kt2sH2PXJtirBN7RDhRpxPkxU= github.com/hashicorp/golang-lru/v2 v2.0.5 h1:wW7h1TG88eUIJ2i69gaE3uNVtEPIagzhGvHgwfx2Vm4= github.com/hashicorp/golang-lru/v2 v2.0.5/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/ianlancetaylor/demangle v0.0.0-20240312041847-bd984b5ce465/go.mod h1:gx7rwoVhcfuVKG5uya9Hs3Sxj7EIvldVofAWIUtGouw= +github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4= github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/invopop/yaml v0.2.0 h1:7zky/qH+O0DwAyoobXUqvVBwgBFRxKoQ/3FjcVpjTMY= github.com/invopop/yaml v0.2.0/go.mod h1:2XuRLgs/ouIrW3XNzuNj7J3Nvu/Dig5MXvbCEdiBN3Q= +github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= +github.com/jmespath/go-jmespath v0.4.1-0.20220621161143-b0104c826a24 h1:liMMTbpW34dhU4az1GN0pTPADwNmvoRSeoZ6PItiqnY= +github.com/jmespath/go-jmespath v0.4.1-0.20220621161143-b0104c826a24/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= +github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= +github.com/kdomanski/iso9660 v0.2.1 h1:IepyfCeEqx77rZeOM4XZgWB4XJWEF7Jp+1ehMTrSElg= +github.com/kdomanski/iso9660 v0.2.1/go.mod h1:LY50s7BlG+ES6V99oxYGd0ub9giLrKdHZb3LLOweBj0= +github.com/kelseyhightower/envconfig v1.4.0/go.mod h1:cccZRl6mQpaq41TPp5QxidR+Sa3axMbJDNb//FQX6Gg= +github.com/keploy/go-sdk v0.4.3 h1:dCsmfANlZH94It+JKWx8/JEEC6dn8W7KIRRKRZwCPZQ= +github.com/keploy/go-sdk v0.4.3/go.mod h1:tn62gQ8a/AD7mY51DvQfhudiBPTlD+w3XtXemDcbON4= +github.com/kevinmbeaulieu/eq-go v1.0.0/go.mod h1:G3S8ajA56gKBZm4UB9AOyoOS37JO3roToPzKNM8dtdM= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= +github.com/klauspost/compress v1.15.0/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= +github.com/klauspost/compress v1.15.1/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= +github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= +github.com/labstack/echo/v4 v4.6.1/go.mod h1:RnjgMWNDB9g/HucVWhQYNQP9PvbYf6adqftqryo7s9k= +github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k= +github.com/ledongthuc/pdf v0.0.0-20220302134840-0c2507a12d80/go.mod h1:imJHygn/1yfhB7XSJJKlFZKl/J+dCPAknuiaGOshXAs= +github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= +github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY= +github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= +github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= +github.com/lestrrat-go/backoff/v2 v2.0.8/go.mod h1:rHP/q/r9aT27n24JQLa7JhSQZCKBBOiM/uP402WwN8Y= +github.com/lestrrat-go/blackmagic v1.0.0/go.mod h1:TNgH//0vYSs8VXDCfkZLgIrVTTXQELZffUV0tz3MtdQ= +github.com/lestrrat-go/httpcc v1.0.0/go.mod h1:tGS/u00Vh5N6FHNkExqGGNId8e0Big+++0Gf8MBnAvE= +github.com/lestrrat-go/iter v1.0.1/go.mod h1:zIdgO1mRKhn8l9vrZJZz9TUMMFbQbLeTsbqPDrJ/OJc= +github.com/lestrrat-go/jwx v1.2.20/go.mod h1:tLE1XszaFgd7zaS5wHe4NxA+XVhu7xgdRvDpNyi3kNM= +github.com/lestrrat-go/option v1.0.0/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I= +github.com/logrusorgru/aurora/v3 v3.0.0/go.mod h1:vsR12bk5grlLvLXAYrBsb5Oc/N+LxAlxggSjiwMnCUc= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= @@ -238,12 +390,26 @@ github.com/marcnuri-forks/operator-framework-api v0.0.0-20241001140003-cf4aa8da1 github.com/marcnuri-forks/operator-framework-api v0.0.0-20241001140003-cf4aa8da1ffa/go.mod h1:l1JgrLzWtCdUiXxQnf4LNVxlgoVEiIKclCEqww9EZrs= github.com/marcnuri-forks/operator-lifecycle-manager v0.0.0-20241002090802-7539192fbf96 h1:SYIVgj5Jfq7gpO1kqSvKYazwhVgGvAfszlKFoqVqw3g= github.com/marcnuri-forks/operator-lifecycle-manager v0.0.0-20241002090802-7539192fbf96/go.mod h1:ToPwavGeU72yaPYn18qaDo6anPlJvFiAkgXhS39PgPc= -github.com/mattn/go-sqlite3 v1.14.23 h1:gbShiuAP1W5j9UOksQ06aiiqPMxYecovVGwmTxWtuw0= -github.com/mattn/go-sqlite3 v1.14.23/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= +github.com/matryer/moq v0.2.3/go.mod h1:9RtPYjTnH1bSBIkpvtHkFN7nbWAnO7oRpdJkEIn6UtE= +github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= +github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= +github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJKjyR5WD3HYQSd+U= +github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= +github.com/metal3-io/baremetal-operator/apis v0.4.0 h1:1g5S3SKu9FqeD7OIf5jGKS6234HjNQpIRmfepZnSmiQ= +github.com/metal3-io/baremetal-operator/apis v0.4.0/go.mod h1:1GDBiA3XqdP63dLZHJ1JH5fRJrfjn7pshoPEd9jwY7Q= +github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.4.0 h1:AnA8XLLp3RKYjjlB4KI0fyPSDN/d5gb3ZtM2cVyxwOc= +github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.4.0/go.mod h1:399nvdaqoU9rTI25UdFw2EWcVjmJPpeZPIhfDAIx/XU= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.2.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/moby/locker v1.0.1 h1:fOXqR41zeveg4fFODix+1Ch4mj/gT0NE1XJbp/epuBg= github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc= github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= +github.com/moby/spdystream v0.4.0/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVOwrfMgdI= github.com/moby/sys/mountinfo v0.7.2 h1:1shs6aH5s4o5H2zQLn796ADW1wMrIwHsyJ2v9KouLrg= github.com/moby/sys/mountinfo v0.7.2/go.mod h1:1YOa8w8Ih7uW0wALDUgT1dTTSBrZ+HiBLGws92L2RU4= github.com/moby/sys/sequential v0.5.0 h1:OPvI35Lzn9K04PBbCLW0g4LcFAJgHsvXsRyewg5lXtc= @@ -255,25 +421,48 @@ github.com/moby/sys/userns v0.1.0/go.mod h1:IHUYgu/kao6N8YZlp9Cf444ySSvCmDlmzUcY github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw= github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= +github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= +github.com/nutanix-cloud-native/prism-go-client v0.3.4 h1:bHY3VPrHHYnbRtkpGaKK+2ZmvUjNVRC55CYZbXIfnOk= +github.com/nutanix-cloud-native/prism-go-client v0.3.4/go.mod h1:tTIH02E6o6AWSShr98QChoxuZl+jBhkXFixom9+fd1Y= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= -github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= +github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= +github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= +github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= +github.com/onsi/ginkgo/v2 v2.1.4/go.mod h1:um6tUpWM/cxCK3/FK8BXqEiUMUwRgSM4JXG47RKZmLU= +github.com/onsi/ginkgo/v2 v2.1.6/go.mod h1:MEH45j8TBi6u9BMogfbp0stKC5cdGjumZj5Y7AG4VIk= +github.com/onsi/ginkgo/v2 v2.3.0/go.mod h1:Eew0uilEqZmIEZr8JrvYlvOM7Rr6xzTmMV8AyFNU9d0= +github.com/onsi/ginkgo/v2 v2.4.0/go.mod h1:iHkDK1fKGcBoEHT5W7YBq4RFWaQulw+caOMkAt4OrFo= +github.com/onsi/ginkgo/v2 v2.5.0/go.mod h1:Luc4sArBICYCS8THh8v3i3i5CuSZO+RaQRaJoeNwomw= +github.com/onsi/ginkgo/v2 v2.7.0/go.mod h1:yjiuMwPokqY1XauOgju45q3sJt6VzQ/Fict1LFVcsAo= +github.com/onsi/ginkgo/v2 v2.8.1/go.mod h1:N1/NbDngAFcSLdyZ+/aYTYGSlq9qMCS/cNKGJjy+csc= +github.com/onsi/ginkgo/v2 v2.9.0/go.mod h1:4xkjoL/tZv4SMWeww56BU5kAt19mVB47gTWxmrTcxyk= +github.com/onsi/ginkgo/v2 v2.9.1/go.mod h1:FEcmzVcCHl+4o9bQZVab+4dC9+j+91t2FHSzmGAPfuo= +github.com/onsi/ginkgo/v2 v2.9.2/go.mod h1:WHcJJG2dIlcCqVfBAwUCrJxSPFb6v4azBwgxeMeDuts= +github.com/onsi/ginkgo/v2 v2.9.5/go.mod h1:tvAoo1QUJwNEU2ITftXTpR7R1RbCzoZUOs3RonqW57k= +github.com/onsi/ginkgo/v2 v2.9.7/go.mod h1:cxrmXWykAwTwhQsJOPfdIDiJ+l2RYq7U8hFU+M/1uw0= +github.com/onsi/ginkgo/v2 v2.11.0/go.mod h1:ZhrRA5XmEE3x3rhlzamx/JJvujdZoJ2uvgI7kR0iZvM= +github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o= +github.com/onsi/ginkgo/v2 v2.17.1/go.mod h1:llBI3WDLL9Z6taip6f33H76YcWtJv+7R3HigUjbIBOs= +github.com/onsi/ginkgo/v2 v2.17.2/go.mod h1:nP2DPOQoNsQmsVyv5rDA8JkXQoCs6goXIvr/PRJ1eCc= +github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To= github.com/onsi/ginkgo/v2 v2.20.2 h1:7NVCeyIWROIAheY21RLS+3j2bb52W0W82tkberYytp4= github.com/onsi/ginkgo/v2 v2.20.2/go.mod h1:K9gyxPIlb+aIvnZ8bd9Ak+YP18w3APlR+5coaZoE2ag= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= @@ -281,6 +470,23 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs= +github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro= +github.com/onsi/gomega v1.20.1/go.mod h1:DtrZpjmvpn2mPm4YWQa0/ALMDj9v4YxLgojwPeREyVo= +github.com/onsi/gomega v1.21.1/go.mod h1:iYAIXgPSaDHak0LCMA+AWBpIKBr8WZicMxnE8luStNc= +github.com/onsi/gomega v1.22.1/go.mod h1:x6n7VNe4hw0vkyYUM4mjIXx3JbLiPaBPNgB7PRQ1tuM= +github.com/onsi/gomega v1.24.0/go.mod h1:Z/NWtiqwBrwUt4/2loMmHL63EDLnYHmVbuBpDr2vQAg= +github.com/onsi/gomega v1.24.1/go.mod h1:3AOiACssS3/MajrniINInwbfOOtfZvplPzuRSmvt1jM= +github.com/onsi/gomega v1.26.0/go.mod h1:r+zV744Re+DiYCIPRlYOTxn0YkOLcAnW8k1xXdMPGhM= +github.com/onsi/gomega v1.27.1/go.mod h1:aHX5xOykVYzWOV4WqQy0sy8BQptgukenXpCXfadcIAw= +github.com/onsi/gomega v1.27.3/go.mod h1:5vG284IBtfDAmDyrK+eGyZmUgUlmi+Wngqo557cZ6Gw= +github.com/onsi/gomega v1.27.4/go.mod h1:riYq/GJKh8hhoM01HN6Vmuy93AarCXCBGpvFDK3q3fQ= +github.com/onsi/gomega v1.27.6/go.mod h1:PIQNjfQwkP3aQAH7lf7j87O/5FiNr+ZR8+ipb+qQlhg= +github.com/onsi/gomega v1.27.7/go.mod h1:1p8OOlwo2iUUDsHnOrjE5UKYJ+e3W8eQ3qSlRahPmr4= +github.com/onsi/gomega v1.27.8/go.mod h1:2J8vzI/s+2shY9XHRApDkdgPo1TKT7P2u6fXeJKFnNQ= +github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M= +github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= +github.com/onsi/gomega v1.33.0/go.mod h1:+925n5YtiFsLzzafLUHzVMBpvvRAzrydIBiSIxjX3wY= +github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= github.com/onsi/gomega v1.34.2 h1:pNCwDkzrsv7MS9kpaQvVb1aVLahQXyJ/Tv5oAZMI3i8= github.com/onsi/gomega v1.34.2/go.mod h1:v1xfxRgk0KIsG+QOdm7p8UosrOzPYRo60fd3B/1Dukc= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= @@ -299,14 +505,20 @@ github.com/openshift/custom-resource-status v1.1.3-0.20220503160415-f2fdb4999d87 github.com/openshift/custom-resource-status v1.1.3-0.20220503160415-f2fdb4999d87/go.mod h1:DB/Mf2oTeiAmVVX1gN+NEqweonAPY0TKUwADizj8+ZA= github.com/openshift/hive/apis v0.0.0-20240930213556-2d25383963db h1:81l8GpANADhpr6xuHXi/tfhCOusAJiMBrL35dc3lhrs= github.com/openshift/hive/apis v0.0.0-20240930213556-2d25383963db/go.mod h1:27UntBsyKUZ9+xMcX6uXLhXsd9U8p/FI0mmIlH7SRG0= +github.com/openshift/installer v0.91.0 h1:pHcDYujhwTM3J+9TcPbc9ddgIZAdNXkuDm1SpsGaG18= +github.com/openshift/installer v0.91.0/go.mod h1:U6mPWM1tZEiV0mC31M6bCzI49DOkSnfaCpLyI9Duc30= github.com/operator-framework/operator-registry v1.47.0 h1:Imr7X/W6FmXczwpIOXfnX8d6Snr1dzwWxkMG+lLAfhg= github.com/operator-framework/operator-registry v1.47.0/go.mod h1:CJ3KcP8uRxtC8l9caM1RsV7r7jYlKAd452tcxcgXyTQ= +github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde/go.mod h1:nZgzbfBr3hhjoZnS66nKrHmduYNpc34ny7RK4z5/HM0= github.com/otiai10/copy v1.14.0 h1:dCI/t1iTdYGtkvCuBG2BgR6KZa83PTclw4U5n2wAllU= github.com/otiai10/copy v1.14.0/go.mod h1:ECfuL02W+/FkTWZWgQqXPWZgW9oeKCSQ5qVfSc4qc4w= github.com/perimeterx/marshmallow v1.1.5 h1:a2LALqQ1BlHM8PZblsDdidgv1mWi1DgC2UmX50IvK2s= github.com/perimeterx/marshmallow v1.1.5/go.mod h1:dsXbUu8CRzfYP5a87xpp0xq9S3u0Vchtcl8we9tYaXw= +github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2 h1:JhzVVoYvbOACxoUmOs6V/G4D5nPVUW73rKvXxP4XUJc= github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2/go.mod h1:iIss55rKnNBTvrwdmkUpLnDpZoAHvWaiq5+iMmen4AE= +github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -329,9 +541,16 @@ github.com/redis/go-redis/extra/redisotel/v9 v9.0.5 h1:EfpWLLCyXw8PSM2/XNJLjI3Pb github.com/redis/go-redis/extra/redisotel/v9 v9.0.5/go.mod h1:WZjPDy7VNzn77AAfnAfVjZNvfJTYfPetfZk5yoSTLaQ= github.com/redis/go-redis/v9 v9.1.0 h1:137FnGdk+EQdCbye1FW+qOEcY5S+SpY9T0NiuqvtfMY= github.com/redis/go-redis/v9 v9.1.0/go.mod h1:urWj3He21Dj5k4TK1y59xH8Uj6ATueP8AH1cY3lZl4c= +github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= +github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= +github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE= +github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= +github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= +github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= @@ -346,28 +565,56 @@ github.com/stoewer/go-strcase v1.3.0/go.mod h1:fAH5hQ5pehh+j3nZfvwdk2RgEgQjAoM8w github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 h1:kdXcSzyDtseVEc4yCz2qF8ZrQvIDBJLl4S1c3GCXmoI= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= +github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= +github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo= +github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= +github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0= github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY= +github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= +github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= +github.com/valyala/fasthttp v1.35.0/go.mod h1:t/G+3rLek+CyY9bnIE+YlMRddxVAAGjhxndDB4i4C0I= +github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= +github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= +github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc= +github.com/vektah/gqlparser/v2 v2.2.0 h1:bAc3slekAAJW6sZTi07aGq0OrfaCjj4jxARAaC7g2EM= +github.com/vektah/gqlparser/v2 v2.2.0/go.mod h1:i3mQIGIrbK2PD1RrCeMTlVbkF2FJ6WkU1KJlJlC+3F4= +github.com/vincent-petithory/dataurl v1.0.0 h1:cXw+kPto8NLuJtlMsI152irrVw9fRDX8AbShPRpg2CI= +github.com/vincent-petithory/dataurl v1.0.0/go.mod h1:FHafX5vmDzyP+1CQATJn7WFKc9CvnvxyvZy6I1MrG/U= github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= +github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= +github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs= +github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM= +github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.etcd.io/bbolt v1.3.11 h1:yGEzV1wPz2yVCLsD8ZAiGHhHVlczyC9d1rP43/VCRJ0= go.etcd.io/bbolt v1.3.11/go.mod h1:dksAq7YMXoljX0xu6VF5DMZGbhYYoLUalEiSySYAS4I= +go.keploy.io/server v0.1.8 h1:b50vAt1+WKMscYVP5Bm8gx/iSaR7mpHox8VpaxjrQ88= +go.keploy.io/server v0.1.8/go.mod h1:ZqhwTZOBb+dzx5t30Wt6eUGI6kO5QizvPg6coNPtbow= +go.mongodb.org/mongo-driver v1.8.0/go.mod h1:0sQWfOeY63QTntERDJJ/0SuKK0T1uVSgKCuAROlKEPY= +go.mongodb.org/mongo-driver v1.8.1/go.mod h1:0sQWfOeY63QTntERDJJ/0SuKK0T1uVSgKCuAROlKEPY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/contrib/exporters/autoexport v0.46.1 h1:ysCfPZB9AjUlMa1UHYup3c9dAOCMQX/6sxSfPBUoxHw= @@ -400,13 +647,45 @@ go.opentelemetry.io/otel/sdk/metric v1.28.0 h1:OkuaKgKrgAbYrrY0t92c+cC+2F6hsFNnC go.opentelemetry.io/otel/sdk/metric v1.28.0/go.mod h1:cWPjykihLAPvXKi4iZc1dpER3Jdq2Z0YLse3moQUCpg= go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= +go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeXrui0= go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8= +go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= +go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= +go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= +go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= +go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= +go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= +go.uber.org/zap v1.19.0/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= +go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI= +go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw= +go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= +go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= +golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= +golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= +golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio= +golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= +golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= +golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= +golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= +golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= +golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= +golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= +golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M= +golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= +golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM= golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A= golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -415,15 +694,28 @@ golang.org/x/exp v0.0.0-20240909161429-701f63a606c0/go.mod h1:2TbTHSBQa924w8M6Xs golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= +golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI= +golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -431,35 +723,78 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210421230115-4e50805a0758/go.mod h1:72T/g9IO56b78aLF+1Kcs5dz7/ng1VjMUvfKvpfy+jM= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210913180222-943fd674d43e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= +golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= +golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= +golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= +golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= +golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= +golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= +golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= +golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= +golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= +golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo= golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs= golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -470,16 +805,65 @@ golang.org/x/sys v0.0.0-20210420072515-93ed5bcd2bfe/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210910150752-751e447fb3d0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/telemetry v0.0.0-20240208230135-b75ee8823808/go.mod h1:KG1lNk5ZFNssSZLrpVb4sMXKMpGwGXOxSG3rnu2gZQQ= +golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE= +golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= +golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= +golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= +golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= +golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o= +golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU= +golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= +golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= +golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0= +golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY= +golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= +golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= +golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk= +golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= +golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0= golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM= golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -488,44 +872,86 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U= golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190531172133-b3315ee88b7d/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200815165600-90abf76919f3/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.6-0.20210820212750-d4cc65f0b2ff/go.mod h1:YD9qOF0M9xpSpdWTBbzEl5e/RnCefISl8E5Noe10jFM= golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= +golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA= +golang.org/x/tools v0.4.0/go.mod h1:UE5sM2OK9E/d67R0ANs2xJizIymRP5gJU295PvKXxjQ= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s= +golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= +golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= +golang.org/x/tools v0.12.0/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM= +golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= +golang.org/x/tools v0.16.1/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0= +golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps= +golang.org/x/tools v0.18.0/go.mod h1:GL7B4CwcLLeo59yx/9UWWuNOW1n3VZ4f5axWfML7Lcg= +golang.org/x/tools v0.20.0/go.mod h1:WvitBU7JJf6A4jOdg4S1tviW9bhUxkgeCui/0JHctQg= +golang.org/x/tools v0.21.0/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= +golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= golang.org/x/tools v0.25.0 h1:oFU9pkj/iJgs+0DT+VMHrx+oBKs/LJMV+Uvg78sl+fE= golang.org/x/tools v0.25.0/go.mod h1:/vtpO8WL1N9cQC3FN5zPqb//fRXskFHbLKk4OW1Q7rg= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= +gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw= +gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20240311173647-c811ad7063a7 h1:ImUcDPHjTrAqNhlOkSocDLfG9rrNHH7w7uoKWPaWZ8s= -google.golang.org/genproto v0.0.0-20240311173647-c811ad7063a7/go.mod h1:/3XmxOjePkvmKrHuBy4zNFw7IzxJXtAgdpXi8Ll990U= +google.golang.org/genproto v0.0.0-20240722135656-d784300faade h1:lKFsS7wpngDgSCeFn7MoLy+wBDQZ1UQIJD4UNM1Qvkg= +google.golang.org/genproto v0.0.0-20240722135656-d784300faade/go.mod h1:FfBgJBJg9GcpPvKIuHSZ/aE1g2ecGL74upMzGZjiGEY= google.golang.org/genproto/googleapis/api v0.0.0-20240711142825-46eb208f015d h1:kHjw/5UfflP/L5EbledDrcG4C2597RtymmGRZvHiCuY= google.golang.org/genproto/googleapis/api v0.0.0-20240711142825-46eb208f015d/go.mod h1:mw8MG/Qz5wfgYr6VqVCiZcHe/GJEfI+oGGDCohaVgB0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240722135656-d784300faade h1:oCRSWfwGXQsqlVdErcyTt4A93Y8fo0/9D4b1gnI++qo= google.golang.org/genproto/googleapis/rpc v0.0.0-20240722135656-d784300faade/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= +google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.66.0 h1:DibZuoBznOxbDQxRINckZcUvnCEvrW9pcWIE2yF9r1c= google.golang.org/grpc v1.66.0/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= @@ -537,9 +963,12 @@ google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= +google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -548,12 +977,16 @@ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/evanphx/json-patch.v4 v4.12.0 h1:n6jtcsulIzXPJaxegRbvFNNrZDjbij7ny3gmSPG+6V4= +gopkg.in/evanphx/json-patch.v4 v4.12.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= @@ -568,11 +1001,14 @@ gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= k8s.io/api v0.23.3/go.mod h1:w258XdGyvCmnBj/vGzQMj6kzdufJZVUwEM1U2fRJwSQ= +k8s.io/api v0.24.2/go.mod h1:AHqbSkTm6YrQ0ObxjO3Pmp/ubFF/KuM7jU+3khoBsOg= k8s.io/api v0.31.1 h1:Xe1hX/fPW3PXYYv8BlozYqw63ytA92snr96zMW9gWTU= k8s.io/api v0.31.1/go.mod h1:sbN1g6eY6XVLeqNsZGLnI5FwVseTrZX7Fv3O26rhAaI= k8s.io/apiextensions-apiserver v0.31.1 h1:L+hwULvXx+nvTYX/MKM3kKMZyei+UiSXQWciX/N6E40= k8s.io/apiextensions-apiserver v0.31.1/go.mod h1:tWMPR3sgW+jsl2xm9v7lAyRF1rYEK71i9G5dRtkknoQ= k8s.io/apimachinery v0.23.3/go.mod h1:BEuFMMBaIbcOqVIJqNZJXGFTP4W6AycEpb5+m/97hrM= +k8s.io/apimachinery v0.24.2/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM= +k8s.io/apimachinery v0.24.3/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM= k8s.io/apimachinery v0.31.1 h1:mhcUBbj7KUjaVhyXILglcVjuS4nYXiwC+KKFBgIVy7U= k8s.io/apimachinery v0.31.1/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= k8s.io/apiserver v0.31.1 h1:Sars5ejQDCRBY5f7R3QFHdqN3s61nhkpaX8/k1iEw1c= @@ -584,22 +1020,31 @@ k8s.io/component-base v0.31.1 h1:UpOepcrX3rQ3ab5NB6g5iP0tvsgJWzxTyAo20sgYSy8= k8s.io/component-base v0.31.1/go.mod h1:WGeaw7t/kTsqpVTaCoVEtillbqAhF2/JgvO0LDOMa0w= k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/gengo v0.0.0-20211129171323-c02415ce4185/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= +k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70/go.mod h1:VH3AT8AaQOqiGjMF9p0/IM1Dj+82ZwjfxUP1IxaHE+8= k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 h1:si3PfKm8dDYxgfbeA6orqrtLkvvIeH8UqffFJDl0bz4= k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9/go.mod h1:EJykeLsmFC60UQbYJezXkEsG2FLrt0GPNkU5iK5GWxU= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.30.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/klog/v2 v2.40.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk= k8s.io/kube-openapi v0.0.0-20220124234850-424119656bbf/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk= +k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42/go.mod h1:Z/45zLw8lUo4wdiUkI+v/ImEGAvu3WatcZl3lPMR4Rk= +k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98= k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38 h1:1dWzkmJrrprYvjGwh9kEUxmcUV/CtNU8QM7h1FLWQOo= k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38/go.mod h1:coRQXBK9NxO98XUv3ZD6AK3xzHCxV6+b7lrquKwaKzA= -k8s.io/metrics v0.30.2 h1:zj4kIPTCfEbY0RHEogpA7QtlItU7xaO11+Gz1zVDxlc= -k8s.io/metrics v0.30.2/go.mod h1:GpoO5XTy/g8CclVLtgA5WTrr2Cy5vCsqr5Xa/0ETWIk= +k8s.io/metrics v0.30.3 h1:gKCpte5zykrOmQhZ8qmsxyJslMdiLN+sqbBfIWNpbGM= +k8s.io/metrics v0.30.3/go.mod h1:W06L2nXRhOwPkFYDJYWdEIS3u6JcJy3ebIPYbndRs6A= k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= k8s.io/utils v0.0.0-20240902221715-702e33fdd3c3 h1:b2FmK8YH+QEwq/Sy2uAEhmqL5nPfGYbJOcaqjeYYZoA= k8s.io/utils v0.0.0-20240902221715-702e33fdd3c3/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 h1:2770sDpzrjjsAtVhSeUFseziht227YAWYHLGNM8QPwY= @@ -609,6 +1054,7 @@ sigs.k8s.io/controller-runtime v0.19.0/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hw sigs.k8s.io/gateway-api v1.1.0 h1:DsLDXCi6jR+Xz8/xd0Z1PYl2Pn0TyaFMOPPZIj4inDM= sigs.k8s.io/gateway-api v1.1.0/go.mod h1:ZH4lHrL2sDi0FHZ9jjneb8kKnGzFWyrTya35sWUTrRs= sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6/go.mod h1:p4QtZmO4uMYipTQNzagwnNoseA6OxSUutVw05NhYDRs= +sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2/go.mod h1:B+TnT182UBxE84DiCz4CVE26eOSDAeYCpfDnC2kdKMY= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/kustomize/api v0.17.2 h1:E7/Fjk7V5fboiuijoZHgs4aHuexi5Y2loXlVOAVAG5g= @@ -617,6 +1063,7 @@ sigs.k8s.io/kustomize/kyaml v0.17.1 h1:TnxYQxFXzbmNG6gOINgGWQt09GghzgTP6mIurOgrL sigs.k8s.io/kustomize/kyaml v0.17.1/go.mod h1:9V0mCjIEYjlXuCdYsSXvyoy2BTsLESH7TlGV81S282U= sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= +sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E= sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= diff --git a/kubernetes-model-generator/openapi/generator/pkg/openshift/openshift.go b/kubernetes-model-generator/openapi/generator/pkg/openshift/openshift.go index 0030a7c868f..1df0f5a0a5d 100644 --- a/kubernetes-model-generator/openapi/generator/pkg/openshift/openshift.go +++ b/kubernetes-model-generator/openapi/generator/pkg/openshift/openshift.go @@ -30,6 +30,19 @@ var PackagePatterns = []string{ "github.com/openshift/cluster-network-operator/pkg/apis/.../v...", "github.com/openshift/cluster-node-tuning-operator/pkg/apis/tuned/v...", "github.com/openshift/hive/apis/hive/v...", + "github.com/openshift/installer/pkg/types", // Add manually each package since some subpackages are problematic with go modules + "github.com/openshift/installer/pkg/types/aws", + "github.com/openshift/installer/pkg/types/azure", + "github.com/openshift/installer/pkg/types/baremetal", + "github.com/openshift/installer/pkg/types/external", + "github.com/openshift/installer/pkg/types/gcp", + "github.com/openshift/installer/pkg/types/ibmcloud", + "github.com/openshift/installer/pkg/types/none", + "github.com/openshift/installer/pkg/types/nutanix", + "github.com/openshift/installer/pkg/types/openstack", + "github.com/openshift/installer/pkg/types/ovirt", + "github.com/openshift/installer/pkg/types/powervs", + "github.com/openshift/installer/pkg/types/vsphere", "github.com/operator-framework/api/pkg/operators/v...", "github.com/operator-framework/operator-lifecycle-manager/pkg/package-server/apis/operators/v...", "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v...", diff --git a/kubernetes-model-generator/openapi/generator/pkg/parser/parser.go b/kubernetes-model-generator/openapi/generator/pkg/parser/parser.go index e8adf8daacb..97c1dd1ab82 100644 --- a/kubernetes-model-generator/openapi/generator/pkg/parser/parser.go +++ b/kubernetes-model-generator/openapi/generator/pkg/parser/parser.go @@ -27,6 +27,7 @@ import ( const genClient = "+genclient" const genClientPrefix = genClient + ":" const groupNamePrefix = "+groupName=" +const versionNamePrefix = "+versionName=" type Module struct { patterns []string @@ -66,7 +67,7 @@ func (oam *Module) ExtractInfo(definitionName string) *Fabric8Info { fabric8Info := &Fabric8Info{} fabric8Info.Type = resolveType(typ) fabric8Info.Group = groupName(pkg) - fabric8Info.Version = pkg.Name + fabric8Info.Version = versionName(pkg) fabric8Info.Kind = typ.Name.Name fabric8Info.Scope = scope(typ) return fabric8Info @@ -88,7 +89,7 @@ func (oam *Module) ApiName(definitionName string) string { for i, j := 0, len(groupParts)-1; i < j; i, j = i+1, j-1 { groupParts[i], groupParts[j] = groupParts[j], groupParts[i] } - return strings.Join(groupParts, ".") + "." + pkg.Name + "." + typeName + return strings.Join(groupParts, ".") + "." + versionName(pkg) + "." + typeName } func (oam *Module) resolvePackage(definitionName string) *types.Package { @@ -105,9 +106,26 @@ func (oam *Module) resolvePackage(definitionName string) *types.Package { } func groupName(pkg *types.Package) string { + return findTag(pkg, groupNamePrefix) +} + +func versionName(pkg *types.Package) string { + // Some packages have a versionName tag, but it's not the standard (usually package name is used instead) + v := findTag(pkg, versionNamePrefix) + if v != "" { + return v + } + return pkg.Name +} + +func findTag(pkg *types.Package, tag string) string { for _, c := range pkg.Comments { - if strings.HasPrefix(c, groupNamePrefix) { - return strings.TrimPrefix(c, groupNamePrefix) + if strings.HasPrefix(c, tag) { + t := strings.TrimPrefix(c, tag) + // Incredibly 🤦, there are some operators with a badly defined groupName tag: + // https://github.com/openshift/installer/blob/66e9daae9dae59c2ec167a6c31f2f2c127382357/pkg/types/doc.go#L1 + t = strings.ReplaceAll(t, "\"", "") + return t } } return "" diff --git a/kubernetes-model-generator/openapi/generator/tools/generator/openapi.go b/kubernetes-model-generator/openapi/generator/tools/generator/openapi.go index 63593229ecb..c409d56a12f 100644 --- a/kubernetes-model-generator/openapi/generator/tools/generator/openapi.go +++ b/kubernetes-model-generator/openapi/generator/tools/generator/openapi.go @@ -22,11 +22,15 @@ import ( "fmt" "github.com/fabric8io/kubernetes-client/kubernetes-model-generator/openapi/generator/pkg/openapi" "github.com/fabric8io/kubernetes-client/kubernetes-model-generator/openapi/generator/pkg/openshift" + "strings" + //openshiftbaremetaloperatorv1alpha1 "github.com/metal3-io/baremetal-operator/apis/metal3.io/v1alpha1" + openshiftconfigv1 "github.com/openshift/api/config/v1" openshiftcloudcredentialoperatorv1 "github.com/openshift/cloud-credential-operator/pkg/apis/cloudcredential/v1" openshiftclusternetworkoperatorv1 "github.com/openshift/cluster-network-operator/pkg/apis/network/v1" openshiftclusternodetuningoperatorv1 "github.com/openshift/cluster-node-tuning-operator/pkg/apis/tuned/v1" openshifthivev1 "github.com/openshift/hive/apis/hive/v1" + openshiftinstallerv1 "github.com/openshift/installer/pkg/types" operatorframeworkv1 "github.com/operator-framework/api/pkg/operators/v1" operatorframeworkv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1" olm "github.com/operator-framework/operator-lifecycle-manager/pkg/package-server/apis/operators/v1" @@ -37,18 +41,20 @@ import ( func main() { startTime := time.Now() - fmt.Printf("OpenAPI code generation started...\n%s\n", []string{ + fmt.Printf("OpenAPI code generation started...\n%s\n", strings.Join([]string{ // Force imports so that modules are present in go.mod - operatorframeworkv1alpha1.SchemeGroupVersion.String(), - operatorframeworkv1.GroupVersion.String(), + openshiftconfigv1.SchemeGroupVersion.String(), //openshiftbaremetaloperatorv1alpha1.GroupVersion.String(), + olm.SchemeGroupVersion.String(), openshiftcloudcredentialoperatorv1.GroupVersion.String(), openshiftclusternetworkoperatorv1.GroupVersion.String(), openshiftclusternodetuningoperatorv1.SchemeGroupVersion.String(), openshifthivev1.SchemeGroupVersion.String(), - olm.SchemeGroupVersion.String(), + "install.openshift.io/" + openshiftinstallerv1.InstallConfigVersion + " (" + strings.Join(openshiftinstallerv1.PlatformNames, ", ") + ")", + operatorframeworkv1alpha1.SchemeGroupVersion.String(), + operatorframeworkv1.GroupVersion.String(), prometheusoperatorv1.SchemeGroupVersion.String(), - }) + }, "\n")) err := (&openapi.GoGenerator{ Args: args.Args{ OutputFile: "zz_generated.openapi.go", diff --git a/kubernetes-model-generator/openapi/maven-plugin/src/main/java/io/fabric8/kubernetes/schema/generator/GeneratorSettings.java b/kubernetes-model-generator/openapi/maven-plugin/src/main/java/io/fabric8/kubernetes/schema/generator/GeneratorSettings.java index d0aed0bded2..2f647fa81df 100644 --- a/kubernetes-model-generator/openapi/maven-plugin/src/main/java/io/fabric8/kubernetes/schema/generator/GeneratorSettings.java +++ b/kubernetes-model-generator/openapi/maven-plugin/src/main/java/io/fabric8/kubernetes/schema/generator/GeneratorSettings.java @@ -84,6 +84,17 @@ public class GeneratorSettings { private final AtomicBoolean packageMappingsProcessed = new AtomicBoolean(false); @Builder.Default private Properties refToJavaTypeMappings = new Properties(); + /** + * Allows configuring the mapping of specific field names to other names. + *

+ * This is currently needed as a workaround for Sundrio's issues when generating builders when a class has two + * List or array fields with a plural and singular. + *

+ * For example, when a class has both `List items` and `List item`, Sundrio generates a + * fluent builder with conflicting names such as buildItem(int), buildFirstItem(), and so on. + */ + @Singular + private Map fieldNameMappings; @Singular private Set skipGenerationRegexes; @Singular diff --git a/kubernetes-model-generator/openapi/maven-plugin/src/main/java/io/fabric8/kubernetes/schema/generator/model/ModelGenerator.java b/kubernetes-model-generator/openapi/maven-plugin/src/main/java/io/fabric8/kubernetes/schema/generator/model/ModelGenerator.java index 02404fb5920..248fa14e9a7 100644 --- a/kubernetes-model-generator/openapi/maven-plugin/src/main/java/io/fabric8/kubernetes/schema/generator/model/ModelGenerator.java +++ b/kubernetes-model-generator/openapi/maven-plugin/src/main/java/io/fabric8/kubernetes/schema/generator/model/ModelGenerator.java @@ -52,7 +52,6 @@ import static io.fabric8.kubernetes.schema.generator.schema.SchemaUtils.isArray; import static io.fabric8.kubernetes.schema.generator.schema.SchemaUtils.isMap; import static io.fabric8.kubernetes.schema.generator.schema.SchemaUtils.sanitizeDescription; -import static io.fabric8.kubernetes.schema.generator.schema.SchemaUtils.sanitizeVariable; import static io.fabric8.kubernetes.schema.generator.schema.SchemaUtils.serializerForJavaClass; import static io.fabric8.kubernetes.schema.generator.schema.SchemaUtils.serializerForSchema; import static io.fabric8.kubernetes.schema.generator.schema.SchemaUtils.setterName; @@ -164,7 +163,7 @@ private List> templateFields(TemplateContext templateContext final String type = utils.schemaToClassName(templateContext, propertySchema); templateProp.put("propertyName", property.getKey()); templateProp.put("type", type); - templateProp.put("name", sanitizeVariable(property.getKey())); + templateProp.put("name", utils.sanitizeFieldName(property.getKey())); templateProp.put("getterName", getterName(property.getKey())); templateProp.put("setterName", setterName(property.getKey())); if (Optional.ofNullable(templateContext.getClassSchema().getRequired()).orElse(Collections.emptyList()) diff --git a/kubernetes-model-generator/openapi/maven-plugin/src/main/java/io/fabric8/kubernetes/schema/generator/schema/SchemaUtils.java b/kubernetes-model-generator/openapi/maven-plugin/src/main/java/io/fabric8/kubernetes/schema/generator/schema/SchemaUtils.java index b5761566a8d..bdb50b700de 100644 --- a/kubernetes-model-generator/openapi/maven-plugin/src/main/java/io/fabric8/kubernetes/schema/generator/schema/SchemaUtils.java +++ b/kubernetes-model-generator/openapi/maven-plugin/src/main/java/io/fabric8/kubernetes/schema/generator/schema/SchemaUtils.java @@ -148,6 +148,7 @@ public class SchemaUtils { "int", "package", "private", + "public", "return", "short", "static")); @@ -361,10 +362,11 @@ public static String removeDashes(String variable) { return sanitized.toString(); } - public static String sanitizeVariable(String variable) { - final String sanitized = uncapitalize(removeDashes(variable)); + public String sanitizeFieldName(String fieldName) { + final String sanitized = uncapitalize(removeDashes(fieldName)); final String mapped = MAPPED_WORDS.getOrDefault(sanitized, sanitized); - return PROTECTED_WORDS.contains(mapped) ? "_" + mapped : mapped; + final String userMapped = settings.getFieldNameMappings().getOrDefault(mapped, mapped); + return PROTECTED_WORDS.contains(userMapped) ? "_" + userMapped : userMapped; } public static String getterName(String variable) { diff --git a/kubernetes-model-generator/openapi/maven-plugin/src/test/java/io/fabric8/kubernetes/schema/generator/SchemaUtilsTest.java b/kubernetes-model-generator/openapi/maven-plugin/src/test/java/io/fabric8/kubernetes/schema/generator/SchemaUtilsTest.java index 72a1ccbbbf9..61159ae724c 100644 --- a/kubernetes-model-generator/openapi/maven-plugin/src/test/java/io/fabric8/kubernetes/schema/generator/SchemaUtilsTest.java +++ b/kubernetes-model-generator/openapi/maven-plugin/src/test/java/io/fabric8/kubernetes/schema/generator/SchemaUtilsTest.java @@ -88,10 +88,16 @@ void toModelPackage(String packageName, String expected) { "import, _import", "return, _return", "return-, _return", - "--return-, _return" + "--return-, _return", + "items, itemList", + "items--, itemList", + "edge--, _private" }) - void sanitizeVariable(String variable, String expected) { - assertEquals(expected, SchemaUtils.sanitizeVariable(variable)); + void sanitizeFieldName(String variable, String expected) { + assertEquals(expected, new SchemaUtils(generatorSettingsBuilder + .fieldNameMapping("items", "itemList") + .fieldNameMapping("edge", "private") + .build()).sanitizeFieldName(variable)); } @ParameterizedTest diff --git a/kubernetes-model-generator/openapi/schemas/openshift-generated.json b/kubernetes-model-generator/openapi/schemas/openshift-generated.json index 8f361b80e29..6642abed5ba 100644 --- a/kubernetes-model-generator/openapi/schemas/openshift-generated.json +++ b/kubernetes-model-generator/openapi/schemas/openshift-generated.json @@ -16447,6 +16447,3501 @@ "Scope": "Namespaced" } }, + "com.github.openshift.installer.pkg.types.aws.EC2Metadata": { + "description": "EC2Metadata defines the metadata service interaction options for an ec2 instance. https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/configuring-instance-metadata-service.html", + "type": "object", + "properties": { + "authentication": { + "description": "Authentication determines whether or not the host requires the use of authentication when interacting with the metadata service. When using authentication, this enforces v2 interaction method (IMDSv2) with the metadata service. When omitted, this means the user has no opinion and the value is left to the platform to choose a good default, which is subject to change over time. The current default is optional. At this point this field represents `HttpTokens` parameter from `InstanceMetadataOptionsRequest` structure in AWS EC2 API https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_InstanceMetadataOptionsRequest.html", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "aws", + "Kind": "EC2Metadata", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.aws.EC2RootVolume": { + "description": "EC2RootVolume defines the storage for an ec2 instance.", + "type": "object", + "required": [ + "size", + "type" + ], + "properties": { + "iops": { + "description": "IOPS defines the amount of provisioned IOPS. (KiB/s). IOPS may only be set for io1, io2, \u0026 gp3 volume types.", + "type": "integer", + "format": "int32", + "default": 0 + }, + "kmsKeyARN": { + "description": "The KMS key that will be used to encrypt the EBS volume. If no key is provided the default KMS key for the account will be used. https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_GetEbsDefaultKmsKeyId.html", + "type": "string" + }, + "size": { + "description": "Size defines the size of the volume in gibibytes (GiB).", + "type": "integer", + "format": "int32", + "default": 0 + }, + "type": { + "description": "Type defines the type of the volume.", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "aws", + "Kind": "EC2RootVolume", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.aws.MachinePool": { + "description": "MachinePool stores the configuration for a machine pool installed on AWS.", + "type": "object", + "properties": { + "additionalSecurityGroupIDs": { + "description": "AdditionalSecurityGroupIDs contains IDs of additional security groups for machines, where each ID is presented in the format sg-xxxx.", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "amiID": { + "description": "AMIID is the AMI that should be used to boot the ec2 instance. If set, the AMI should belong to the same region as the cluster.", + "type": "string" + }, + "iamProfile": { + "description": "IAMProfile is the name of the IAM instance profile to use for the machine. Leave unset to have the installer create the IAM Profile on your behalf. Cannot be specified together with iamRole.", + "type": "string" + }, + "iamRole": { + "description": "IAMRole is the name of the IAM Role to use for the instance profile of the machine. Leave unset to have the installer create the IAM Role on your behalf. Cannot be specified together with iamProfile.", + "type": "string" + }, + "metadataService": { + "description": "EC2MetadataOptions defines metadata service interaction options for EC2 instances in the machine pool.", + "default": {}, + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.aws.EC2Metadata" + }, + "rootVolume": { + "description": "EC2RootVolume defines the root volume for EC2 instances in the machine pool.", + "default": {}, + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.aws.EC2RootVolume" + }, + "type": { + "description": "InstanceType defines the ec2 instance type. eg. m4-large", + "type": "string", + "default": "" + }, + "zones": { + "description": "Zones is list of availability zones that can be used.", + "type": "array", + "items": { + "type": "string", + "default": "" + } + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "aws", + "Kind": "MachinePool", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.aws.Metadata": { + "description": "Metadata contains AWS metadata (e.g. for uninstalling the cluster).", + "type": "object", + "required": [ + "region", + "identifier", + "clusterDomain" + ], + "properties": { + "clusterDomain": { + "description": "ClusterDomain is the domain for the cluster.", + "type": "string", + "default": "" + }, + "hostedZoneRole": { + "description": "HostedZoneRole is the role to assume when performing operations on a hosted zone owned by another account.", + "type": "string" + }, + "identifier": { + "description": "Identifier holds a slice of filter maps. The maps hold the key/value pairs for the tags we will be matching against. A resource matches the map if all of the key/value pairs are in its tags. A resource matches Identifier if it matches any of the maps.", + "type": "array", + "items": { + "type": "object", + "additionalProperties": { + "type": "string", + "default": "" + } + } + }, + "region": { + "type": "string", + "default": "" + }, + "serviceEndpoints": { + "description": "ServiceEndpoints list contains custom endpoints which will override default service endpoint of AWS Services. There must be only one ServiceEndpoint for a service.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.aws.ServiceEndpoint" + } + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "aws", + "Kind": "Metadata", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.aws.Platform": { + "description": "Platform stores all the global configuration that all machinesets use.", + "type": "object", + "required": [ + "region" + ], + "properties": { + "amiID": { + "description": "The field is deprecated. AMIID is the AMI that should be used to boot machines for the cluster. If set, the AMI should belong to the same region as the cluster.", + "type": "string" + }, + "bestEffortDeleteIgnition": { + "description": "BestEffortDeleteIgnition is an optional field that can be used to ignore errors from S3 deletion of ignition objects during cluster bootstrap. The default behavior is to fail the installation if ignition objects cannot be deleted. Enable this functionality when there are known reasons disallowing their deletion.", + "type": "boolean" + }, + "defaultMachinePlatform": { + "description": "DefaultMachinePlatform is the default configuration used when installing on AWS for machine pools which do not define their own platform configuration.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.aws.MachinePool" + }, + "experimentalPropagateUserTags": { + "description": "The field is deprecated. ExperimentalPropagateUserTags is an experimental flag that directs in-cluster operators to include the specified user tags in the tags of the AWS resources that the operators create.", + "type": "boolean" + }, + "hostedZone": { + "description": "HostedZone is the ID of an existing hosted zone into which to add DNS records for the cluster's internal API. An existing hosted zone can only be used when also using existing subnets. The hosted zone must be associated with the VPC containing the subnets. Leave the hosted zone unset to have the installer create the hosted zone on your behalf.", + "type": "string" + }, + "hostedZoneRole": { + "description": "HostedZoneRole is the ARN of an IAM role to be assumed when performing operations on the provided HostedZone. HostedZoneRole can be used in a shared VPC scenario when the private hosted zone belongs to a different account than the rest of the cluster resources. If HostedZoneRole is set, HostedZone must also be set.", + "type": "string" + }, + "lbType": { + "description": "LBType is an optional field to specify a load balancer type. When this field is specified, all ingresscontrollers (including the default ingresscontroller) will be created using the specified load-balancer type by default.\n\nFollowing are the accepted values:\n\n* \"Classic\": A Classic Load Balancer that makes routing decisions at either the transport layer (TCP/SSL) or the application layer (HTTP/HTTPS). See the following for additional details: https://docs.aws.amazon.com/AmazonECS/latest/developerguide/load-balancer-types.html#clb\n\n* \"NLB\": A Network Load Balancer that makes routing decisions at the transport layer (TCP/SSL). See the following for additional details: https://docs.aws.amazon.com/AmazonECS/latest/developerguide/load-balancer-types.html#nlb\n\nIf this field is not set explicitly, it defaults to \"Classic\". This default is subject to change over time.", + "type": "string" + }, + "preserveBootstrapIgnition": { + "description": "PreserveBootstrapIgnition is deprecated. Use bestEffortDeleteIgnition instead.", + "type": "boolean" + }, + "propagateUserTags": { + "description": "PropagateUserTags is a flag that directs in-cluster operators to include the specified user tags in the tags of the AWS resources that the operators create.", + "type": "boolean" + }, + "publicIpv4Pool": { + "description": "PublicIpv4Pool is an optional field that can be used to tell the installation process to use Public IPv4 address that you bring to your AWS account with BYOIP.", + "type": "string" + }, + "region": { + "description": "Region specifies the AWS region where the cluster will be created.", + "type": "string", + "default": "" + }, + "serviceEndpoints": { + "description": "ServiceEndpoints list contains custom endpoints which will override default service endpoint of AWS Services. There must be only one ServiceEndpoint for a service.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.aws.ServiceEndpoint" + } + }, + "subnets": { + "description": "Subnets specifies existing subnets (by ID) where cluster resources will be created. Leave unset to have the installer create subnets in a new VPC on your behalf.", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "userTags": { + "description": "UserTags additional keys and values that the installer will add as tags to all resources that it creates. Resources created by the cluster itself may not include these tags.", + "type": "object", + "additionalProperties": { + "type": "string", + "default": "" + } + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "aws", + "Kind": "Platform", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.aws.ServiceEndpoint": { + "description": "ServiceEndpoint store the configuration for services to override existing defaults of AWS Services.", + "type": "object", + "required": [ + "name", + "url" + ], + "properties": { + "name": { + "description": "Name is the name of the AWS service. This must be provided and cannot be empty.", + "type": "string", + "default": "" + }, + "url": { + "description": "URL is fully qualified URI with scheme https, that overrides the default generated endpoint for a client. This must be provided and cannot be empty.", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "aws", + "Kind": "ServiceEndpoint", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.azure.ConfidentialVM": { + "description": "ConfidentialVM defines the UEFI settings for the virtual machine.", + "type": "object", + "properties": { + "uefiSettings": { + "description": "UEFISettings specifies the security settings like secure boot and vTPM used while creating the virtual machine.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.azure.UEFISettings" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "azure", + "Kind": "ConfidentialVM", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.azure.CustomerManagedKey": { + "description": "CustomerManagedKey defines the customer managed key settings for encryption of the Azure storage account.", + "type": "object", + "properties": { + "keyVault": { + "description": "KeyVault is the keyvault used for the customer created key required for encryption.", + "default": {}, + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.azure.KeyVault" + }, + "userAssignedIdentityKey": { + "description": "UserAssignedIdentityKey is the name of the user identity that has access to the managed key.", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "azure", + "Kind": "CustomerManagedKey", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.azure.DiskEncryptionSet": { + "description": "DiskEncryptionSet defines the configuration for a disk encryption set.", + "type": "object", + "required": [ + "subscriptionId", + "resourceGroup", + "name" + ], + "properties": { + "name": { + "description": "Name is the name of the disk encryption set.", + "type": "string", + "default": "" + }, + "resourceGroup": { + "description": "ResourceGroup defines the Azure resource group used by the disk encryption set.", + "type": "string", + "default": "" + }, + "subscriptionId": { + "description": "SubscriptionID defines the Azure subscription the disk encryption set is in.", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "azure", + "Kind": "DiskEncryptionSet", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.azure.KeyVault": { + "description": "KeyVault defines an Azure Key Vault.", + "type": "object", + "required": [ + "resourceGroup", + "name", + "keyName" + ], + "properties": { + "keyName": { + "description": "KeyName is the name of the key vault key.", + "type": "string", + "default": "" + }, + "name": { + "description": "Name is the name of the key vault.", + "type": "string", + "default": "" + }, + "resourceGroup": { + "description": "ResourceGroup defines the Azure resource group used by the key vault.", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "azure", + "Kind": "KeyVault", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.azure.MachinePool": { + "description": "MachinePool stores the configuration for a machine pool installed on Azure.", + "type": "object", + "properties": { + "encryptionAtHost": { + "description": "EncryptionAtHost enables encryption at the VM host.", + "type": "boolean" + }, + "osDisk": { + "description": "OSDisk defines the storage for instance.", + "default": {}, + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.azure.OSDisk" + }, + "osImage": { + "description": "OSImage defines the image to use for the OS.", + "default": {}, + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.azure.OSImage" + }, + "settings": { + "description": "Settings specify the security type and the UEFI settings of the virtual machine. This field can be set for Confidential VMs and Trusted Launch for VMs.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.azure.SecuritySettings" + }, + "type": { + "description": "InstanceType defines the azure instance type. eg. Standard_DS_V2", + "type": "string", + "default": "" + }, + "ultraSSDCapability": { + "description": "ultraSSDCapability defines if the instance should use Ultra SSD disks.", + "type": "string" + }, + "vmNetworkingType": { + "description": "VMNetworkingType specifies whether to enable accelerated networking. Accelerated networking enables single root I/O virtualization (SR-IOV) to a VM, greatly improving its networking performance. eg. values: \"Accelerated\", \"Basic\"", + "type": "string" + }, + "zones": { + "description": "Zones is list of availability zones that can be used. eg. [\"1\", \"2\", \"3\"]", + "type": "array", + "items": { + "type": "string", + "default": "" + } + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "azure", + "Kind": "MachinePool", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.azure.Metadata": { + "description": "Metadata contains Azure metadata (e.g. for uninstalling the cluster).", + "type": "object", + "required": [ + "armEndpoint", + "cloudName", + "region", + "resourceGroupName", + "baseDomainResourceGroupName" + ], + "properties": { + "armEndpoint": { + "type": "string", + "default": "" + }, + "baseDomainResourceGroupName": { + "type": "string", + "default": "" + }, + "cloudName": { + "type": "string", + "default": "" + }, + "region": { + "type": "string", + "default": "" + }, + "resourceGroupName": { + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "azure", + "Kind": "Metadata", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.azure.OSDisk": { + "description": "OSDisk defines the disk for machines on Azure.", + "type": "object", + "required": [ + "diskSizeGB" + ], + "properties": { + "diskEncryptionSet": { + "description": "DiskEncryptionSet defines a disk encryption set.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.azure.DiskEncryptionSet" + }, + "diskSizeGB": { + "description": "DiskSizeGB defines the size of disk in GB.", + "type": "integer", + "format": "int32", + "default": 0 + }, + "diskType": { + "description": "DiskType defines the type of disk. For control plane nodes, the valid values are Premium_LRS and StandardSSD_LRS. Default is Premium_LRS.", + "type": "string", + "default": "" + }, + "securityProfile": { + "description": "SecurityProfile specifies the security profile for the managed disk.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.azure.VMDiskSecurityProfile" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "azure", + "Kind": "OSDisk", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.azure.OSImage": { + "description": "OSImage is the image to use for the OS of a machine.", + "type": "object", + "required": [ + "publisher", + "offer", + "sku", + "version" + ], + "properties": { + "offer": { + "description": "Offer is the offer of the image.", + "type": "string", + "default": "" + }, + "plan": { + "description": "Plan is the purchase plan of the image. If omitted, it defaults to \"WithPurchasePlan\".", + "type": "string", + "default": "" + }, + "publisher": { + "description": "Publisher is the publisher of the image.", + "type": "string", + "default": "" + }, + "sku": { + "description": "SKU is the SKU of the image.", + "type": "string", + "default": "" + }, + "version": { + "description": "Version is the version of the image.", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "azure", + "Kind": "OSImage", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.azure.Platform": { + "description": "Platform stores all the global configuration that all machinesets use.", + "type": "object", + "required": [ + "region" + ], + "properties": { + "armEndpoint": { + "description": "ARMEndpoint is the endpoint for the Azure API when installing on Azure Stack.", + "type": "string" + }, + "baseDomainResourceGroupName": { + "description": "BaseDomainResourceGroupName specifies the resource group where the Azure DNS zone for the base domain is found. This field is optional when creating a private cluster, otherwise required.", + "type": "string" + }, + "cloudName": { + "description": "cloudName is the name of the Azure cloud environment which can be used to configure the Azure SDK with the appropriate Azure API endpoints. If empty, the value is equal to \"AzurePublicCloud\".", + "type": "string" + }, + "clusterOSImage": { + "description": "ClusterOSImage is the url of a storage blob in the Azure Stack environment containing an RHCOS VHD. This field is required for Azure Stack and not applicable to Azure.", + "type": "string" + }, + "computeSubnet": { + "description": "ComputeSubnet specifies an existing subnet for use by compute nodes", + "type": "string" + }, + "controlPlaneSubnet": { + "description": "ControlPlaneSubnet specifies an existing subnet for use by the control plane nodes", + "type": "string" + }, + "customerManagedKey": { + "description": "CustomerManagedKey has the keys needed to encrypt the storage account.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.azure.CustomerManagedKey" + }, + "defaultMachinePlatform": { + "description": "DefaultMachinePlatform is the default configuration used when installing on Azure for machine pools which do not define their own platform configuration.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.azure.MachinePool" + }, + "networkResourceGroupName": { + "description": "NetworkResourceGroupName specifies the network resource group that contains an existing VNet", + "type": "string" + }, + "outboundType": { + "description": "OutboundType is a strategy for how egress from cluster is achieved. When not specified default is \"Loadbalancer\". \"NatGateway\" is only available in TechPreview.", + "type": "string", + "default": "" + }, + "region": { + "description": "Region specifies the Azure region where the cluster will be created.", + "type": "string", + "default": "" + }, + "resourceGroupName": { + "description": "ResourceGroupName is the name of an already existing resource group where the cluster should be installed. This resource group should only be used for this specific cluster and the cluster components will assume ownership of all resources in the resource group. Destroying the cluster using installer will delete this resource group. This resource group must be empty with no other resources when trying to use it for creating a cluster. If empty, a new resource group will created for the cluster.", + "type": "string" + }, + "userTags": { + "description": "UserTags has additional keys and values that the installer will add as tags to all resources that it creates on AzurePublicCloud alone. Resources created by the cluster itself may not include these tags.", + "type": "object", + "additionalProperties": { + "type": "string", + "default": "" + } + }, + "virtualNetwork": { + "description": "VirtualNetwork specifies the name of an existing VNet for the installer to use", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "azure", + "Kind": "Platform", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.azure.SecuritySettings": { + "description": "SecuritySettings define the security type and the UEFI settings of the virtual machine.", + "type": "object", + "properties": { + "confidentialVM": { + "description": "ConfidentialVM specifies the security configuration of the virtual machine. For more information regarding Confidential VMs, please refer to: https://learn.microsoft.com/azure/confidential-computing/confidential-vm-overview", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.azure.ConfidentialVM" + }, + "securityType": { + "description": "SecurityType specifies the SecurityType of the virtual machine. It has to be set to any specified value to enable secure boot and vTPM. The default behavior is: secure boot and vTPM will not be enabled unless this property is set.", + "type": "string" + }, + "trustedLaunch": { + "description": "TrustedLaunch specifies the security configuration of the virtual machine. For more information regarding TrustedLaunch for VMs, please refer to: https://learn.microsoft.com/azure/virtual-machines/trusted-launch", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.azure.TrustedLaunch" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "azure", + "Kind": "SecuritySettings", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.azure.TrustedLaunch": { + "description": "TrustedLaunch defines the UEFI settings for the virtual machine.", + "type": "object", + "properties": { + "uefiSettings": { + "description": "UEFISettings specifies the security settings like secure boot and vTPM used while creating the virtual machine.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.azure.UEFISettings" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "azure", + "Kind": "TrustedLaunch", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.azure.UEFISettings": { + "description": "UEFISettings specifies the security settings like secure boot and vTPM used while creating the virtual machine.", + "type": "object", + "properties": { + "secureBoot": { + "description": "SecureBoot specifies whether secure boot should be enabled on the virtual machine. Secure Boot verifies the digital signature of all boot components and halts the boot process if signature verification fails. If omitted, the platform chooses a default, which is subject to change over time, currently that default is disabled.", + "type": "string" + }, + "virtualizedTrustedPlatformModule": { + "description": "VirtualizedTrustedPlatformModule specifies whether vTPM should be enabled on the virtual machine. When enabled the virtualized trusted platform module measurements are used to create a known good boot integrity policy baseline. The integrity policy baseline is used for comparison with measurements from subsequent VM boots to determine if anything has changed. This is required to be set to enabled if the SecurityEncryptionType is defined. If omitted, the platform chooses a default, which is subject to change over time, currently that default is disabled.", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "azure", + "Kind": "UEFISettings", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.azure.VMDiskSecurityProfile": { + "description": "VMDiskSecurityProfile specifies the security profile settings for the managed disk. It can be set only for Confidential VMs.", + "type": "object", + "properties": { + "diskEncryptionSet": { + "description": "DiskEncryptionSet specifies the customer managed disk encryption set resource id for the managed disk that is used for Customer Managed Key encrypted ConfidentialVM OS Disk and VMGuestState blob.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.azure.DiskEncryptionSet" + }, + "securityEncryptionType": { + "description": "SecurityEncryptionType specifies the encryption type of the managed disk. It is set to DiskWithVMGuestState to encrypt the managed disk along with the VMGuestState blob, and to VMGuestStateOnly to encrypt the VMGuestState blob only. When set to VMGuestStateOnly, the VTpmEnabled should be set to true. When set to DiskWithVMGuestState, both SecureBootEnabled and VTpmEnabled should be set to true. It can be set only for Confidential VMs.", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "azure", + "Kind": "VMDiskSecurityProfile", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.baremetal.BMC": { + "description": "BMC stores the information about a baremetal host's management controller.", + "type": "object", + "required": [ + "username", + "password", + "address", + "disableCertificateVerification" + ], + "properties": { + "address": { + "type": "string", + "default": "" + }, + "disableCertificateVerification": { + "type": "boolean", + "default": false + }, + "password": { + "type": "string", + "default": "" + }, + "username": { + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "baremetal", + "Kind": "BMC", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.baremetal.Host": { + "description": "Host stores all the configuration data for a baremetal host.", + "type": "object", + "required": [ + "bmc", + "role", + "bootMACAddress", + "hardwareProfile" + ], + "properties": { + "bmc": { + "default": {}, + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.baremetal.BMC" + }, + "bootMACAddress": { + "type": "string", + "default": "" + }, + "bootMode": { + "type": "string" + }, + "hardwareProfile": { + "type": "string", + "default": "" + }, + "name": { + "type": "string" + }, + "networkConfig": { + "$ref": "#/definitions/io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1.JSON" + }, + "role": { + "type": "string", + "default": "" + }, + "rootDeviceHints": { + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.baremetal.RootDeviceHints" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "baremetal", + "Kind": "Host", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.baremetal.MachinePool": { + "description": "MachinePool stores the configuration for a machine pool installed on bare metal.", + "type": "object", + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "baremetal", + "Kind": "MachinePool", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.baremetal.Metadata": { + "description": "Metadata contains baremetal metadata (e.g. for uninstalling the cluster).", + "type": "object", + "required": [ + "libvirtURI", + "bootstrapProvisioningIP", + "provisioningHostIP" + ], + "properties": { + "bootstrapProvisioningIP": { + "type": "string", + "default": "" + }, + "libvirtURI": { + "type": "string", + "default": "" + }, + "provisioningHostIP": { + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "baremetal", + "Kind": "Metadata", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.baremetal.Platform": { + "description": "Platform stores all the global configuration that all machinesets use.", + "type": "object", + "required": [ + "hosts" + ], + "properties": { + "apiVIP": { + "description": "DeprecatedAPIVIP is the VIP to use for internal API communication Deprecated: Use APIVIPs", + "type": "string" + }, + "apiVIPs": { + "description": "APIVIPs contains the VIP(s) to use for internal API communication. In dual stack clusters it contains an IPv4 and IPv6 address, otherwise only one VIP", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "bootstrapExternalStaticDNS": { + "description": "BootstrapExternalStaticDNS is the static network DNS of the bootstrap node. This can be useful in environments without a DHCP server.", + "type": "string" + }, + "bootstrapExternalStaticGateway": { + "description": "BootstrapExternalStaticGateway is the static network gateway of the bootstrap node. This can be useful in environments without a DHCP server.", + "type": "string" + }, + "bootstrapExternalStaticIP": { + "description": "BootstrapExternalStaticIP is the static IP address of the bootstrap node. This can be useful in environments without a DHCP server.", + "type": "string" + }, + "bootstrapOSImage": { + "description": "BootstrapOSImage is a URL to override the default OS image for the bootstrap node. The URL must contain a sha256 hash of the image e.g https://mirror.example.com/images/qemu.qcow2.gz?sha256=a07bd...", + "type": "string" + }, + "bootstrapProvisioningIP": { + "description": "BootstrapProvisioningIP is the IP used on the bootstrap VM to bring up provisioning services that are used to create the control-plane machines", + "type": "string" + }, + "clusterOSImage": { + "description": "ClusterOSImage is a URL to override the default OS image for cluster nodes. The URL must contain a sha256 hash of the image e.g https://mirror.example.com/images/metal.qcow2.gz?sha256=3b5a8...", + "type": "string" + }, + "clusterProvisioningIP": { + "description": "ClusterProvisioningIP is the IP on the dedicated provisioning network where the baremetal-operator pod runs provisioning services, and an http server to cache some downloaded content e.g RHCOS/IPA images", + "type": "string" + }, + "defaultMachinePlatform": { + "description": "DefaultMachinePlatform is the default configuration used when installing on bare metal for machine pools which do not define their own platform configuration.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.baremetal.MachinePool" + }, + "externalBridge": { + "description": "External bridge is used for external communication.", + "type": "string" + }, + "externalMACAddress": { + "description": "ExternalMACAddress is used to allow setting a static unicast MAC address for the bootstrap host on the external network. Consider using the QEMU vendor prefix `52:54:00`. If left blank, libvirt will generate one for you.", + "type": "string" + }, + "hosts": { + "description": "Hosts is the information needed to create the objects in Ironic.", + "type": "array", + "items": { + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.baremetal.Host" + } + }, + "ingressVIP": { + "description": "DeprecatedIngressVIP is the VIP to use for ingress traffic Deprecated: Use IngressVIPs", + "type": "string" + }, + "ingressVIPs": { + "description": "IngressVIPs contains the VIP(s) to use for ingress traffic. In dual stack clusters it contains an IPv4 and IPv6 address, otherwise only one VIP", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "libvirtURI": { + "description": "LibvirtURI is the identifier for the libvirtd connection. It must be reachable from the host where the installer is run. Default is qemu:///system", + "type": "string" + }, + "loadBalancer": { + "description": "LoadBalancer defines how the load balancer used by the cluster is configured. LoadBalancer is available in TechPreview.", + "$ref": "#/definitions/io.openshift.config.v1.BareMetalPlatformLoadBalancer" + }, + "provisioningBridge": { + "description": "Provisioning bridge is used for provisioning nodes, on the host that will run the bootstrap VM.", + "type": "string" + }, + "provisioningDHCPExternal": { + "description": "DeprecatedProvisioningDHCPExternal indicates that DHCP is provided by an external service. This parameter is replaced by ProvisioningNetwork being set to \"Unmanaged\".", + "type": "boolean" + }, + "provisioningDHCPRange": { + "description": "ProvisioningDHCPRange is used to provide DHCP services to hosts for provisioning.", + "type": "string" + }, + "provisioningHostIP": { + "description": "DeprecatedProvisioningHostIP is the deprecated version of clusterProvisioningIP. When the baremetal platform was initially added to the installer, the JSON field for ClusterProvisioningIP was incorrectly set to \"provisioningHostIP.\" This field is here to allow backwards-compatibility.", + "type": "string" + }, + "provisioningMACAddress": { + "description": "ProvisioningMACAddress is used to allow setting a static unicast MAC address for the bootstrap host on the provisioning network. Consider using the QEMU vendor prefix `52:54:00`. If left blank, libvirt will generate one for you.", + "type": "string" + }, + "provisioningNetwork": { + "description": "ProvisioningNetwork is used to indicate if we will have a provisioning network, and how it will be managed.", + "type": "string" + }, + "provisioningNetworkCIDR": { + "description": "ProvisioningNetworkCIDR defines the network to use for provisioning.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.ipnet.IPNet" + }, + "provisioningNetworkInterface": { + "description": "ProvisioningNetworkInterface is the name of the network interface on a control plane baremetal host that is connected to the provisioning network.", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "baremetal", + "Kind": "Platform", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.baremetal.RootDeviceHints": { + "description": "RootDeviceHints holds the hints for specifying the storage location for the root filesystem for the image.", + "type": "object", + "properties": { + "deviceName": { + "description": "A Linux device name like \"/dev/vda\". The hint must match the actual value exactly.", + "type": "string" + }, + "hctl": { + "description": "A SCSI bus address like 0:0:0:0. The hint must match the actual value exactly.", + "type": "string" + }, + "minSizeGigabytes": { + "description": "The minimum size of the device in Gigabytes.", + "type": "integer", + "format": "int32" + }, + "model": { + "description": "A vendor-specific device identifier. The hint can be a substring of the actual value.", + "type": "string" + }, + "rotational": { + "description": "True if the device should use spinning media, false otherwise.", + "type": "boolean" + }, + "serialNumber": { + "description": "Device serial number. The hint must match the actual value exactly.", + "type": "string" + }, + "vendor": { + "description": "The name of the vendor or manufacturer of the device. The hint can be a substring of the actual value.", + "type": "string" + }, + "wwn": { + "description": "Unique storage identifier. The hint must match the actual value exactly.", + "type": "string" + }, + "wwnVendorExtension": { + "description": "Unique vendor storage identifier. The hint must match the actual value exactly.", + "type": "string" + }, + "wwnWithExtension": { + "description": "Unique storage identifier with the vendor extension appended. The hint must match the actual value exactly.", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "baremetal", + "Kind": "RootDeviceHints", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.external.Platform": { + "description": "Platform stores configuration related to external cloud providers.", + "type": "object", + "properties": { + "cloudControllerManager": { + "description": "CloudControllerManager when set to external, this property will enable an external cloud provider.", + "type": "string", + "default": "" + }, + "platformName": { + "description": "PlatformName holds the arbitrary string representing the infrastructure provider name, expected to be set at the installation time. This field is solely for informational and reporting purposes and is not expected to be used for decision-making.", + "type": "string", + "default": "Unknown" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "external", + "Kind": "Platform", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.gcp.EncryptionKeyReference": { + "description": "EncryptionKeyReference describes the encryptionKey to use for a disk's encryption.", + "type": "object", + "properties": { + "kmsKey": { + "description": "KMSKey is a reference to a KMS Key to use for the encryption.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.gcp.KMSKeyReference" + }, + "kmsKeyServiceAccount": { + "description": "KMSKeyServiceAccount is the service account being used for the encryption request for the given KMS key. If absent, the Compute Engine default service account is used. See https://cloud.google.com/compute/docs/access/service-accounts#compute_engine_service_account for details on the default service account.", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "gcp", + "Kind": "EncryptionKeyReference", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.gcp.KMSKeyReference": { + "description": "KMSKeyReference gathers required fields for looking up a GCP KMS Key", + "type": "object", + "required": [ + "name", + "keyRing", + "location" + ], + "properties": { + "keyRing": { + "description": "KeyRing is the name of the KMS Key Ring which the KMS Key belongs to.", + "type": "string", + "default": "" + }, + "location": { + "description": "Location is the GCP location in which the Key Ring exists.", + "type": "string", + "default": "" + }, + "name": { + "description": "Name is the name of the customer managed encryption key to be used for the disk encryption.", + "type": "string", + "default": "" + }, + "projectID": { + "description": "ProjectID is the ID of the Project in which the KMS Key Ring exists. Defaults to the VM ProjectID if not set.", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "gcp", + "Kind": "KMSKeyReference", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.gcp.MachinePool": { + "description": "MachinePool stores the configuration for a machine pool installed on GCP.", + "type": "object", + "properties": { + "confidentialCompute": { + "description": "ConfidentialCompute Defines whether the instance should have confidential compute enabled. If enabled OnHostMaintenance is required to be set to \"Terminate\". If omitted, the platform chooses a default, which is subject to change over time, currently that default is false.", + "type": "string", + "default": "Disabled" + }, + "onHostMaintenance": { + "description": "OnHostMaintenance determines the behavior when a maintenance event occurs that might cause the instance to reboot. Allowed values are \"Migrate\" and \"Terminate\". If omitted, the platform chooses a default, which is subject to change over time, currently that default is \"Migrate\".", + "type": "string", + "default": "Migrate" + }, + "osDisk": { + "description": "OSDisk defines the storage for instance.", + "default": {}, + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.gcp.OSDisk" + }, + "osImage": { + "description": "OSImage defines a custom image for instance.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.gcp.OSImage" + }, + "secureBoot": { + "description": "SecureBoot Defines whether the instance should have secure boot enabled. secure boot Verify the digital signature of all boot components, and halt the boot process if signature verification fails. If omitted, the platform chooses a default, which is subject to change over time, currently that default is false.", + "type": "string" + }, + "serviceAccount": { + "description": "ServiceAccount is the email of a gcp service account to be used during installations. The provided service account can be attached to both control-plane nodes and worker nodes in order to provide the permissions required by the cloud provider.", + "type": "string" + }, + "tags": { + "description": "Tags defines a set of network tags which will be added to instances in the machineset", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "type": { + "description": "InstanceType defines the GCP instance type. eg. n1-standard-4", + "type": "string", + "default": "" + }, + "zones": { + "description": "Zones is list of availability zones that can be used.", + "type": "array", + "items": { + "type": "string", + "default": "" + } + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "gcp", + "Kind": "MachinePool", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.gcp.Metadata": { + "description": "Metadata contains GCP metadata (e.g. for uninstalling the cluster).", + "type": "object", + "required": [ + "region", + "projectID" + ], + "properties": { + "networkProjectID": { + "type": "string" + }, + "privateZoneDomain": { + "type": "string" + }, + "projectID": { + "type": "string", + "default": "" + }, + "region": { + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "gcp", + "Kind": "Metadata", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.gcp.Metric": { + "description": "Metric identify a quota. Service/Label matches the Google Quota API names for quota metrics", + "type": "object", + "properties": { + "dimensions": { + "description": "Dimensions are unique axes on which this Limit is applied (e.g. region: us-central-1)", + "type": "object", + "additionalProperties": { + "type": "string", + "default": "" + } + }, + "limit": { + "description": "Limit is the name of the item that's limited (e.g. cpus)", + "type": "string" + }, + "service": { + "description": "Service is the Google Cloud Service to which this quota belongs (e.g. compute.googleapis.com)", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "gcp", + "Kind": "Metric", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.gcp.OSDisk": { + "description": "OSDisk defines the disk for machines on GCP.", + "type": "object", + "required": [ + "DiskSizeGB" + ], + "properties": { + "DiskSizeGB": { + "description": "DiskSizeGB defines the size of disk in GB.", + "type": "integer", + "format": "int64", + "default": 0 + }, + "diskType": { + "description": "DiskType defines the type of disk. For control plane nodes, the valid values are pd-balanced, pd-ssd, and hyperdisk-balanced.", + "type": "string", + "default": "" + }, + "encryptionKey": { + "description": "EncryptionKey defines the KMS key to be used to encrypt the disk.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.gcp.EncryptionKeyReference" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "gcp", + "Kind": "OSDisk", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.gcp.OSImage": { + "description": "OSImage defines the image to use for the OS.", + "type": "object", + "required": [ + "name", + "project" + ], + "properties": { + "name": { + "description": "Name defines the name of the image.", + "type": "string", + "default": "" + }, + "project": { + "description": "Project defines the name of the project containing the image.", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "gcp", + "Kind": "OSImage", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.gcp.Platform": { + "description": "Platform stores all the global configuration that all machinesets use.", + "type": "object", + "required": [ + "projectID", + "region" + ], + "properties": { + "computeSubnet": { + "description": "ComputeSubnet is an existing subnet where the compute nodes will be deployed. The value should be the name of the subnet.", + "type": "string" + }, + "controlPlaneSubnet": { + "description": "ControlPlaneSubnet is an existing subnet where the control plane will be deployed. The value should be the name of the subnet.", + "type": "string" + }, + "defaultMachinePlatform": { + "description": "DefaultMachinePlatform is the default configuration used when installing on GCP for machine pools which do not define their own platform configuration.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.gcp.MachinePool" + }, + "network": { + "description": "Network specifies an existing VPC where the cluster should be created rather than provisioning a new one.", + "type": "string" + }, + "networkProjectID": { + "description": "NetworkProjectID specifies which project the network and subnets exist in when they are not in the main ProjectID.", + "type": "string" + }, + "projectID": { + "description": "ProjectID is the the project that will be used for the cluster.", + "type": "string", + "default": "" + }, + "region": { + "description": "Region specifies the GCP region where the cluster will be created.", + "type": "string", + "default": "" + }, + "userLabels": { + "description": "userLabels has additional keys and values that the installer will add as labels to all resources that it creates on GCP. Resources created by the cluster itself may not include these labels.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.gcp.UserLabel" + } + }, + "userProvisionedDNS": { + "description": "UserProvisionedDNS indicates if the customer is providing their own DNS solution in place of the default provisioned by the Installer.", + "type": "string", + "default": "Disabled" + }, + "userTags": { + "description": "userTags has additional keys and values that the installer will add as tags to all resources that it creates on GCP. Resources created by the cluster itself may not include these tags. Tag key and tag value should be the shortnames of the tag key and tag value resource.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.gcp.UserTag" + } + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "gcp", + "Kind": "Platform", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.gcp.QuotaUsage": { + "description": "QuotaUsage identifies a quota metric and records the usage", + "type": "object", + "properties": { + "amount": { + "description": "Amount is the amount of the quota being used", + "type": "integer", + "format": "int64" + }, + "dimensions": { + "description": "Dimensions are unique axes on which this Limit is applied (e.g. region: us-central-1)", + "type": "object", + "additionalProperties": { + "type": "string", + "default": "" + } + }, + "limit": { + "description": "Limit is the name of the item that's limited (e.g. cpus)", + "type": "string" + }, + "service": { + "description": "Service is the Google Cloud Service to which this quota belongs (e.g. compute.googleapis.com)", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "gcp", + "Kind": "QuotaUsage", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.gcp.UserLabel": { + "description": "UserLabel is a label to apply to GCP resources created for the cluster.", + "type": "object", + "required": [ + "key", + "value" + ], + "properties": { + "key": { + "description": "key is the key part of the label. A label key can have a maximum of 63 characters and cannot be empty. Label must begin with a lowercase letter, and must contain only lowercase letters, numeric characters, and the following special characters `_-`.", + "type": "string", + "default": "" + }, + "value": { + "description": "value is the value part of the label. A label value can have a maximum of 63 characters and cannot be empty. Value must contain only lowercase letters, numeric characters, and the following special characters `_-`.", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "gcp", + "Kind": "UserLabel", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.gcp.UserTag": { + "description": "UserTag is a tag to apply to GCP resources created for the cluster.", + "type": "object", + "required": [ + "parentID", + "key", + "value" + ], + "properties": { + "key": { + "description": "key is the key part of the tag. A tag key can have a maximum of 63 characters and cannot be empty. Tag key must begin and end with an alphanumeric character, and must contain only uppercase, lowercase alphanumeric characters, and the following special characters `._-`.", + "type": "string", + "default": "" + }, + "parentID": { + "description": "parentID is the ID of the hierarchical resource where the tags are defined, e.g. at the Organization or the Project level. To find the Organization ID or Project ID refer to the following pages: https://cloud.google.com/resource-manager/docs/creating-managing-organization#retrieving_your_organization_id, https://cloud.google.com/resource-manager/docs/creating-managing-projects#identifying_projects. An OrganizationID must consist of decimal numbers, and cannot have leading zeroes. A ProjectID must be 6 to 30 characters in length, can only contain lowercase letters, numbers, and hyphens, and must start with a letter, and cannot end with a hyphen.", + "type": "string", + "default": "" + }, + "value": { + "description": "value is the value part of the tag. A tag value can have a maximum of 63 characters and cannot be empty. Tag value must begin and end with an alphanumeric character, and must contain only uppercase, lowercase alphanumeric characters, and the following special characters `_-.@%=+:,*#\u0026(){}[]` and spaces.", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "gcp", + "Kind": "UserTag", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.ibmcloud.BootVolume": { + "description": "BootVolume stores the configuration for an individual machine's boot volume.", + "type": "object", + "properties": { + "encryptionKey": { + "description": "EncryptionKey is the CRN referencing a Key Protect or Hyper Protect Crypto Services key to use for volume encryption. If not specified, a provider managed encryption key will be used.", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "ibmcloud", + "Kind": "BootVolume", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.ibmcloud.DedicatedHost": { + "description": "DedicatedHost stores the configuration for the machine's dedicated host platform.", + "type": "object", + "properties": { + "name": { + "description": "Name is the name of the dedicated host to provision the machine on. If specified, machines will be created on pre-existing dedicated host.", + "type": "string" + }, + "profile": { + "description": "Profile is the profile ID for the dedicated host. If specified, new dedicated host will be created for machines.", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "ibmcloud", + "Kind": "DedicatedHost", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.ibmcloud.EndpointsJSON": { + "description": "EndpointsJSON represents the JSON format to override IBM Cloud Terraform provider utilized service endpoints. https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/guides/custom-service-endpoints#file-structure-for-endpoints-file", + "type": "object", + "properties": { + "IBMCLOUD_CIS_API_ENDPOINT": { + "description": "IBMCloudEndpointCIS contains endpoint mapping for IBM Cloud CIS.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.ibmcloud.EndpointsVisibility" + }, + "IBMCLOUD_COS_CONFIG_ENDPOINT": { + "description": "IBMCloudEndpointCOS contains endpoint mapping for IBM Cloud COS.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.ibmcloud.EndpointsVisibility" + }, + "IBMCLOUD_GS_API_ENDPOINT": { + "description": "IBMCloudEndpointGlobalSearch contains endpoint mapping for IBM Cloud Global Search.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.ibmcloud.EndpointsVisibility" + }, + "IBMCLOUD_GT_API_ENDPOINT": { + "description": "IBMCloudEndpointGlobalTagging contains endpoint mapping for IBM Cloud Global Tagging.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.ibmcloud.EndpointsVisibility" + }, + "IBMCLOUD_HPCS_API_ENDPOINT": { + "description": "IBMCloudEndpointHyperProtect contains endpoint mapping for IBM Cloud Hyper Protect.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.ibmcloud.EndpointsVisibility" + }, + "IBMCLOUD_IAM_API_ENDPOINT": { + "description": "IBMCloudEndpointIAM contains endpoint mapping for IBM Cloud IAM.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.ibmcloud.EndpointsVisibility" + }, + "IBMCLOUD_IS_NG_API_ENDPOINT": { + "description": "IBMCloudEndpointVPC contains endpoint mapping for IBM Cloud VPC.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.ibmcloud.EndpointsVisibility" + }, + "IBMCLOUD_KP_API_ENDPOINT": { + "description": "IBMCloudEndpointKeyProtect contains endpoint mapping for IBM Cloud Key Protect.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.ibmcloud.EndpointsVisibility" + }, + "IBMCLOUD_PRIVATE_DNS_API_ENDPOINT": { + "description": "IBMCloudEndpointDNSServices contains endpoint mapping for IBM Cloud DNS Services.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.ibmcloud.EndpointsVisibility" + }, + "IBMCLOUD_RESOURCE_CONTROLLER_API_ENDPOINT": { + "description": "IBMCloudEndpointResourceController contains endpoint mapping for IBM Cloud Resource Controller.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.ibmcloud.EndpointsVisibility" + }, + "IBMCLOUD_RESOURCE_MANAGEMENT_API_ENDPOINT": { + "description": "IBMCloudEndpointResourceManager contains endpoint mapping for IBM Cloud Resource Manager.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.ibmcloud.EndpointsVisibility" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "ibmcloud", + "Kind": "EndpointsJSON", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.ibmcloud.EndpointsVisibility": { + "description": "EndpointsVisibility contains region mapped endpoint for a service.", + "type": "object", + "required": [ + "private", + "public" + ], + "properties": { + "private": { + "description": "Private is a string-string map of a region name to endpoint URL To prevent maintaining a list of supported regions here, we simply use a map instead of a struct", + "type": "object", + "additionalProperties": { + "type": "string", + "default": "" + } + }, + "public": { + "description": "Public is a string-string map of a region name to endpoint URL To prevent maintaining a list of supported regions here, we simply use a map instead of a struct", + "type": "object", + "additionalProperties": { + "type": "string", + "default": "" + } + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "ibmcloud", + "Kind": "EndpointsVisibility", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.ibmcloud.MachinePool": { + "description": "MachinePool stores the configuration for a machine pool installed on IBM Cloud.", + "type": "object", + "properties": { + "bootVolume": { + "description": "BootVolume is the configuration for the machine's boot volume.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.ibmcloud.BootVolume" + }, + "dedicatedHosts": { + "description": "DedicatedHosts is the configuration for the machine's dedicated host and profile.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.ibmcloud.DedicatedHost" + } + }, + "type": { + "description": "InstanceType is the VSI machine profile.", + "type": "string" + }, + "zones": { + "description": "Zones is the list of availability zones used for machines in the pool.", + "type": "array", + "items": { + "type": "string", + "default": "" + } + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "ibmcloud", + "Kind": "MachinePool", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.ibmcloud.Metadata": { + "description": "Metadata contains IBM Cloud metadata (e.g. for uninstalling the cluster).", + "type": "object", + "required": [ + "accountID", + "baseDomain" + ], + "properties": { + "accountID": { + "type": "string", + "default": "" + }, + "baseDomain": { + "type": "string", + "default": "" + }, + "cisInstanceCRN": { + "type": "string" + }, + "dnsInstanceID": { + "type": "string" + }, + "region": { + "type": "string" + }, + "resourceGroupName": { + "type": "string" + }, + "serviceEndpoints": { + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.IBMCloudServiceEndpoint" + } + }, + "subnets": { + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "vpc": { + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "ibmcloud", + "Kind": "Metadata", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.ibmcloud.Platform": { + "description": "Platform stores all the global configuration that all machinesets use.", + "type": "object", + "required": [ + "region" + ], + "properties": { + "computeSubnets": { + "description": "ComputeSubnets are the names of already existing subnets where the cluster compute nodes should be created.", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "controlPlaneSubnets": { + "description": "ControlPlaneSubnets are the names of already existing subnets where the cluster control plane nodes should be created.", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "defaultMachinePlatform": { + "description": "DefaultMachinePlatform is the default configuration used when installing on IBM Cloud for machine pools which do not define their own platform configuration.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.ibmcloud.MachinePool" + }, + "networkResourceGroupName": { + "description": "NetworkResourceGroupName is the name of an already existing resource group where an existing VPC and set of Subnets exist, to be used during cluster creation.", + "type": "string" + }, + "region": { + "description": "Region specifies the IBM Cloud region where the cluster will be created.", + "type": "string", + "default": "" + }, + "resourceGroupName": { + "description": "ResourceGroupName is the name of an already existing resource group where the cluster should be installed. If empty, a new resource group will be created for the cluster.", + "type": "string" + }, + "serviceEndpoints": { + "description": "ServiceEndpoints is a list which contains custom endpoints to override default service endpoints of IBM Cloud Services. There must only be one ServiceEndpoint for a service (no duplicates).", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.IBMCloudServiceEndpoint" + } + }, + "vpcName": { + "description": "VPCName is the name of an already existing VPC to be used during cluster creation.", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "ibmcloud", + "Kind": "Platform", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.none.Platform": { + "description": "Platform stores any global configuration used for generic platforms.", + "type": "object", + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "none", + "Kind": "Platform", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.nutanix.DataDisk": { + "description": "DataDisk defines a data disk for a Machine VM.", + "type": "object", + "required": [ + "diskSize" + ], + "properties": { + "dataSourceImage": { + "description": "dataSource refers to a data source image for the VM disk.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.nutanix.StorageResourceReference" + }, + "deviceProperties": { + "description": "deviceProperties are the properties of the disk device.", + "$ref": "#/definitions/io.openshift.machine.v1.NutanixVMDiskDeviceProperties" + }, + "diskSize": { + "description": "diskSize is size (in Quantity format) of the disk to attach to the VM. See https://pkg.go.dev/k8s.io/apimachinery/pkg/api/resource#Format for the Quantity format and example documentation. The minimum diskSize is 1GB.", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.api.resource.Quantity" + }, + "storageConfig": { + "description": "storageConfig are the storage configuration parameters of the VM disks.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.nutanix.StorageConfig" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "nutanix", + "Kind": "DataDisk", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.nutanix.FailureDomain": { + "description": "FailureDomain configures failure domain information for the Nutanix platform.", + "type": "object", + "required": [ + "name", + "prismElement", + "subnetUUIDs" + ], + "properties": { + "dataSourceImages": { + "description": "DataSourceImages identifies the datasource images in the Prism Element.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.nutanix.StorageResourceReference" + } + }, + "name": { + "description": "Name defines the unique name of a failure domain.", + "type": "string", + "default": "" + }, + "prismElement": { + "description": "prismElement holds the identification (name, uuid) and the optional endpoint address and port of the Nutanix Prism Element. When a cluster-wide proxy is installed, by default, this endpoint will be accessed via the proxy. Should you wish for communication with this endpoint not to be proxied, please add the endpoint to the proxy spec.noProxy list.", + "default": {}, + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.nutanix.PrismElement" + }, + "storageContainers": { + "description": "StorageContainers identifies the storage containers in the Prism Element.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.nutanix.StorageResourceReference" + } + }, + "subnetUUIDs": { + "description": "SubnetUUIDs identifies the network subnets of the Prism Element. Currently we only support one subnet for a failure domain.", + "type": "array", + "items": { + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "set" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "nutanix", + "Kind": "FailureDomain", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.nutanix.MachinePool": { + "description": "MachinePool stores the configuration for a machine pool installed on Nutanix.", + "type": "object", + "properties": { + "bootType": { + "description": "BootType indicates the boot type (Legacy, UEFI or SecureBoot) the Machine's VM uses to boot. If this field is empty or omitted, the VM will use the default boot type \"Legacy\" to boot. \"SecureBoot\" depends on \"UEFI\" boot, i.e., enabling \"SecureBoot\" means that \"UEFI\" boot is also enabled.", + "type": "string" + }, + "categories": { + "description": "Categories optionally adds one or more prism categories (each with key and value) for the Machine's VM to associate with. All the category key and value pairs specified must already exist in the prism central.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1.NutanixCategory" + }, + "x-kubernetes-list-map-keys": [ + "key" + ], + "x-kubernetes-list-type": "map" + }, + "coresPerSocket": { + "description": "NumCoresPerSocket is the number of cores per socket in a vm. The number of vCPUs on the vm will be NumCPUs times NumCoresPerSocket. For example: 4 CPUs and 4 Cores per socket will result in 16 VPUs. The AHV scheduler treats socket and core allocation exactly the same so there is no benefit to configuring cores over CPUs.", + "type": "integer", + "format": "int64" + }, + "cpus": { + "description": "NumCPUs is the total number of virtual processor cores to assign a vm.", + "type": "integer", + "format": "int64" + }, + "dataDisks": { + "description": "DataDisks holds information of the data disks to attach to the Machine's VM", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.nutanix.DataDisk" + }, + "x-kubernetes-list-type": "set" + }, + "failureDomains": { + "description": "FailureDomains optionally configures a list of failure domain names that will be applied to the MachinePool", + "type": "array", + "items": { + "type": "string", + "default": "" + }, + "x-kubernetes-list-type": "set" + }, + "gpus": { + "description": "GPUs is a list of GPU devices to attach to the machine's VM.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.machine.v1.NutanixGPU" + }, + "x-kubernetes-list-type": "set" + }, + "memoryMiB": { + "description": "Memory is the size of a VM's memory in MiB.", + "type": "integer", + "format": "int64" + }, + "osDisk": { + "description": "OSDisk defines the storage for instance.", + "default": {}, + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.nutanix.OSDisk" + }, + "project": { + "description": "Project optionally identifies a Prism project for the Machine's VM to associate with.", + "$ref": "#/definitions/io.openshift.machine.v1.NutanixResourceIdentifier" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "nutanix", + "Kind": "MachinePool", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.nutanix.Metadata": { + "description": "Metadata contains Nutanix metadata (e.g. for uninstalling the cluster).", + "type": "object", + "required": [ + "prismCentral", + "username", + "password", + "port" + ], + "properties": { + "password": { + "description": "Password is the password for the user to use to connect to the Prism Central.", + "type": "string", + "default": "" + }, + "port": { + "description": "Port is the port used to connect to the Prism Central.", + "type": "string", + "default": "" + }, + "prismCentral": { + "description": "PrismCentral is the domain name or IP address of the Prism Central.", + "type": "string", + "default": "" + }, + "username": { + "description": "Username is the name of the user to use to connect to the Prism Central.", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "nutanix", + "Kind": "Metadata", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.nutanix.OSDisk": { + "description": "OSDisk defines the system disk for a Machine VM.", + "type": "object", + "properties": { + "diskSizeGiB": { + "description": "DiskSizeGiB defines the size of disk in GiB.", + "type": "integer", + "format": "int64" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "nutanix", + "Kind": "OSDisk", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.nutanix.Platform": { + "description": "Platform stores any global configuration used for Nutanix platforms.", + "type": "object", + "required": [ + "prismCentral", + "prismElements", + "subnetUUIDs" + ], + "properties": { + "apiVIP": { + "description": "DeprecatedAPIVIP is the virtual IP address for the api endpoint Deprecated: use APIVIPs", + "type": "string" + }, + "apiVIPs": { + "description": "APIVIPs contains the VIP(s) for the api endpoint. In dual stack clusters it contains an IPv4 and IPv6 address, otherwise only one VIP", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "clusterOSImage": { + "description": "ClusterOSImage overrides the url provided in rhcos.json to download the RHCOS Image.", + "type": "string" + }, + "defaultMachinePlatform": { + "description": "DefaultMachinePlatform is the default configuration used when installing on Nutanix for machine pools which do not define their own platform configuration.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.nutanix.MachinePool" + }, + "failureDomains": { + "description": "FailureDomains configures failure domains for the Nutanix platform.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.nutanix.FailureDomain" + } + }, + "ingressVIP": { + "description": "DeprecatedIngressVIP is the virtual IP address for ingress Deprecated: use IngressVIPs", + "type": "string" + }, + "ingressVIPs": { + "description": "IngressVIPs contains the VIP(s) for ingress. In dual stack clusters it contains an IPv4 and IPv6 address, otherwise only one VIP", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "loadBalancer": { + "description": "LoadBalancer defines how the load balancer used by the cluster is configured. LoadBalancer is available in TechPreview.", + "$ref": "#/definitions/io.openshift.config.v1.NutanixPlatformLoadBalancer" + }, + "prismCentral": { + "description": "PrismCentral is the endpoint (address and port) and credentials to connect to the Prism Central. This serves as the default Prism-Central.", + "default": {}, + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.nutanix.PrismCentral" + }, + "prismElements": { + "description": "PrismElements holds a list of Prism Elements (clusters). A Prism Element encompasses all Nutanix resources (VMs, subnets, etc.) used to host the OpenShift cluster. Currently only a single Prism Element may be defined. This serves as the default Prism-Element.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.nutanix.PrismElement" + } + }, + "subnetUUIDs": { + "description": "SubnetUUIDs identifies the network subnets to be used by the cluster. Currently we only support one subnet for an OpenShift cluster.", + "type": "array", + "items": { + "type": "string", + "default": "" + } + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "nutanix", + "Kind": "Platform", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.nutanix.PrismCentral": { + "description": "PrismCentral holds the endpoint and credentials data used to connect to the Prism Central", + "type": "object", + "required": [ + "endpoint", + "username", + "password" + ], + "properties": { + "endpoint": { + "description": "Endpoint holds the address and port of the Prism Central", + "default": {}, + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.nutanix.PrismEndpoint" + }, + "password": { + "description": "Password is the password for the user to connect to the Prism Central", + "type": "string", + "default": "" + }, + "username": { + "description": "Username is the name of the user to connect to the Prism Central", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "nutanix", + "Kind": "PrismCentral", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.nutanix.PrismElement": { + "description": "PrismElement holds the uuid, endpoint of the Prism Element (cluster)", + "type": "object", + "required": [ + "uuid" + ], + "properties": { + "endpoint": { + "description": "Endpoint holds the address and port of the Prism Element", + "default": {}, + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.nutanix.PrismEndpoint" + }, + "name": { + "description": "Name is prism endpoint Name", + "type": "string" + }, + "uuid": { + "description": "UUID is the UUID of the Prism Element (cluster)", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "nutanix", + "Kind": "PrismElement", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.nutanix.PrismEndpoint": { + "description": "PrismEndpoint holds the endpoint address and port to access the Nutanix Prism Central or Element (cluster)", + "type": "object", + "required": [ + "address", + "port" + ], + "properties": { + "address": { + "description": "address is the endpoint address (DNS name or IP address) of the Nutanix Prism Central or Element (cluster)", + "type": "string", + "default": "" + }, + "port": { + "description": "port is the port number to access the Nutanix Prism Central or Element (cluster)", + "type": "integer", + "format": "int32", + "default": 0 + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "nutanix", + "Kind": "PrismEndpoint", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.nutanix.StorageConfig": { + "description": "StorageConfig specifies the storage configuration parameters for VM disks.", + "type": "object", + "required": [ + "diskMode" + ], + "properties": { + "diskMode": { + "description": "diskMode specifies the disk mode. The valid values are Standard and Flash, and the default is Standard.", + "type": "string", + "default": "" + }, + "storageContainer": { + "description": "storageContainer refers to the storage_container used by the VM disk.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.nutanix.StorageResourceReference" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "nutanix", + "Kind": "StorageConfig", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.nutanix.StorageResourceReference": { + "description": "StorageResourceReference holds reference information of a storage resource (storage container, data source image, etc.)", + "type": "object", + "required": [ + "uuid" + ], + "properties": { + "name": { + "description": "Name is the name of the storage container resource in the Prism Element.", + "type": "string" + }, + "referenceName": { + "description": "ReferenceName is the identifier of the storage resource configured in the FailureDomain.", + "type": "string" + }, + "uuid": { + "description": "UUID is the UUID of the storage container resource in the Prism Element.", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "nutanix", + "Kind": "StorageResourceReference", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.nutanix.metadataCloudInit": { + "type": "object", + "required": [ + "uuid" + ], + "properties": { + "uuid": { + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "nutanix", + "Kind": "metadataCloudInit", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.openstack.FixedIP": { + "description": "FixedIP identifies a subnet defined by a subnet filter.", + "type": "object", + "required": [ + "subnet" + ], + "properties": { + "subnet": { + "default": {}, + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.openstack.SubnetFilter" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "openstack", + "Kind": "FixedIP", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.openstack.MachinePool": { + "description": "MachinePool stores the configuration for a machine pool installed on OpenStack.", + "type": "object", + "required": [ + "type" + ], + "properties": { + "additionalNetworkIDs": { + "description": "AdditionalNetworkIDs contains IDs of additional networks for machines, where each ID is presented in UUID v4 format. Allowed address pairs won't be created for the additional networks.", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "additionalSecurityGroupIDs": { + "description": "AdditionalSecurityGroupIDs contains IDs of additional security groups for machines, where each ID is presented in UUID v4 format.", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "rootVolume": { + "description": "RootVolume defines the root volume for instances in the machine pool. The instances use ephemeral disks if not set.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.openstack.RootVolume" + }, + "serverGroupPolicy": { + "description": "ServerGroupPolicy will be used to create the Server Group that will contain all the machines of this MachinePool. Defaults to \"soft-anti-affinity\".", + "type": "string" + }, + "type": { + "description": "FlavorName defines the OpenStack Nova flavor. eg. m1.large", + "type": "string", + "default": "" + }, + "zones": { + "description": "Zones is the list of availability zones where the instances should be deployed. If no zones are provided, all instances will be deployed on OpenStack Nova default availability zone", + "type": "array", + "items": { + "type": "string", + "default": "" + } + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "openstack", + "Kind": "MachinePool", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.openstack.Metadata": { + "description": "Metadata contains OpenStack metadata (e.g. for uninstalling the cluster).", + "type": "object", + "required": [ + "cloud", + "identifier" + ], + "properties": { + "cloud": { + "type": "string", + "default": "" + }, + "identifier": { + "description": "Most OpenStack resources are tagged with these tags as identifier.", + "type": "object", + "additionalProperties": { + "type": "string", + "default": "" + } + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "openstack", + "Kind": "Metadata", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.openstack.NetworkFilter": { + "description": "NetworkFilter defines a network by name and/or ID.", + "type": "object", + "properties": { + "id": { + "type": "string" + }, + "name": { + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "openstack", + "Kind": "NetworkFilter", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.openstack.Platform": { + "description": "Platform stores all the global configuration that all machinesets use.", + "type": "object", + "required": [ + "cloud" + ], + "properties": { + "apiFloatingIP": { + "description": "APIFloatingIP is the IP address of an available floating IP in your OpenStack cluster to associate with the OpenShift API load balancer.", + "type": "string" + }, + "apiVIP": { + "description": "DeprecatedAPIVIP is the static IP on the nodes subnet that the api port for openshift will be assigned Default: will be set to the 5 on the first entry in the machineNetwork CIDR Deprecated: Use APIVIPs", + "type": "string" + }, + "apiVIPs": { + "description": "APIVIPs contains the VIP(s) on the nodes subnet that the api port for openshift will be assigned. In dual stack clusters it contains an IPv4 and IPv6 address, otherwise only one VIP Default: will be set to the 5 on the first entry in the machineNetwork CIDR", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "cloud": { + "description": "Cloud is the name of OpenStack cloud to use from clouds.yaml.", + "type": "string", + "default": "" + }, + "clusterOSImage": { + "description": "ClusterOSImage is either a URL with `http(s)` or `file` scheme to override the default OS image for cluster nodes, or an existing Glance image name.", + "type": "string" + }, + "clusterOSImageProperties": { + "description": "ClusterOSImageProperties is a list of properties to be added to the metadata of the uploaded Glance ClusterOSImage. Default: the default is to not set any properties.", + "type": "object", + "additionalProperties": { + "type": "string", + "default": "" + } + }, + "computeFlavor": { + "description": "DeprecatedFlavorName is the name of the flavor to use for instances in this cluster. Deprecated: use FlavorName in DefaultMachinePlatform to define default flavor.", + "type": "string" + }, + "controlPlanePort": { + "description": "ControlPlanePort contains details of the network attached to the control plane port, with the network either containing one openstack subnet for IPv4 or two openstack subnets for dualstack clusters. Providing this configuration will prevent OpenShift from managing or updating this network and its subnets. The network and its subnets will be used during creation of all nodes.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.openstack.PortTarget" + }, + "defaultMachinePlatform": { + "description": "DefaultMachinePlatform is the default configuration used when installing on OpenStack for machine pools which do not define their own platform configuration.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.openstack.MachinePool" + }, + "externalDNS": { + "description": "ExternalDNS holds the IP addresses of dns servers that will be added to the dns resolution of all instances in the cluster.", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "externalNetwork": { + "description": "ExternalNetwork is name of the external network in your OpenStack cluster.", + "type": "string" + }, + "ingressFloatingIP": { + "description": "IngressFloatingIP is the ID of an available floating IP in your OpenStack cluster that will be associated with the OpenShift ingress port", + "type": "string" + }, + "ingressVIP": { + "description": "DeprecatedIngressVIP is the static IP on the nodes subnet that the apps port for openshift will be assigned Default: will be set to the 7 on the first entry in the machineNetwork CIDR Deprecated: Use IngressVIPs", + "type": "string" + }, + "ingressVIPs": { + "description": "IngressVIPs contains the VIP(s) on the nodes subnet that the apps port for openshift will be assigned. In dual stack clusters it contains an IPv4 and IPv6 address, otherwise only one VIP Default: will be set to the 7 on the first entry in the machineNetwork CIDR", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "lbFloatingIP": { + "description": "LbFloatingIP is the IP address of an available floating IP in your OpenStack cluster to associate with the OpenShift load balancer. Deprecated: this value has been renamed to apiFloatingIP.", + "type": "string" + }, + "loadBalancer": { + "description": "LoadBalancer defines how the load balancer used by the cluster is configured.", + "$ref": "#/definitions/io.openshift.config.v1.OpenStackPlatformLoadBalancer" + }, + "machinesSubnet": { + "description": "DeprecatedMachinesSubnet is a string of the UUIDv4 of an openstack subnet. This subnet will be used by all nodes created by the installer. By setting this, the installer will no longer create a network and subnet. The subnet and network specified in MachinesSubnet will not be deleted or modified by the installer. Deprecated: Use ControlPlanePort", + "type": "string" + }, + "octaviaSupport": { + "description": "OctaviaSupport holds a `0` or `1` value that indicates whether your OpenStack cluster supports Octavia Loadbalancing. Deprecated: this value is set by the installer automatically.", + "type": "string" + }, + "region": { + "description": "Region specifies the OpenStack region where the cluster will be created. Deprecated: this value is not used by the installer.", + "type": "string" + }, + "trunkSupport": { + "description": "TrunkSupport holds a `0` or `1` value that indicates whether or not to use trunk ports in your OpenShift cluster. Deprecated: the machine manifest should be used to specify that trunk should be used.", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "openstack", + "Kind": "Platform", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.openstack.PortTarget": { + "description": "PortTarget defines, directly or indirectly, one or more subnets where to attach a port.", + "type": "object", + "required": [ + "fixedIPs" + ], + "properties": { + "fixedIPs": { + "description": "Specify subnets of the network where control plane port will be discovered.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.openstack.FixedIP" + } + }, + "network": { + "description": "Network is a query for an openstack network that the port will be discovered on. This will fail if the query returns more than one network.", + "default": {}, + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.openstack.NetworkFilter" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "openstack", + "Kind": "PortTarget", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.openstack.RootVolume": { + "description": "RootVolume defines the storage for an instance.", + "type": "object", + "required": [ + "size", + "types" + ], + "properties": { + "size": { + "description": "Size defines the size of the volume in gibibytes (GiB). Required", + "type": "integer", + "format": "int32", + "default": 0 + }, + "type": { + "description": "Type defines the type of the volume. Deprecated: Use Types instead.", + "type": "string" + }, + "types": { + "description": "Types is the list of the volume types of the root volumes. This is mutually exclusive with Type.", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "zones": { + "description": "Zones is the list of availability zones where the root volumes should be deployed. If no zones are provided, all instances will be deployed on OpenStack Cinder default availability zone", + "type": "array", + "items": { + "type": "string", + "default": "" + } + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "openstack", + "Kind": "RootVolume", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.openstack.SubnetFilter": { + "description": "SubnetFilter defines a subnet by ID and/or name.", + "type": "object", + "properties": { + "id": { + "type": "string" + }, + "name": { + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "openstack", + "Kind": "SubnetFilter", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.ovirt.AffinityGroup": { + "description": "AffinityGroup defines the affinity group that the installer will create", + "type": "object", + "required": [ + "name", + "priority" + ], + "properties": { + "description": { + "description": "Description of the affinity group", + "type": "string" + }, + "enforcing": { + "description": "Enforcing whether to create a hard affinity rule, default is false", + "type": "boolean", + "default": false + }, + "name": { + "description": "Name name of the affinity group", + "type": "string", + "default": "" + }, + "priority": { + "description": "Priority of the affinity group, needs to be between 1 (lowest) - 5 (highest)", + "type": "integer", + "format": "int32", + "default": 0 + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "ovirt", + "Kind": "AffinityGroup", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.ovirt.CPU": { + "description": "CPU defines the VM cpu, made of (Sockets * Cores).", + "type": "object", + "required": [ + "sockets", + "cores", + "threads" + ], + "properties": { + "cores": { + "description": "Cores is the number of cores per socket. Total CPUs is (Sockets * Cores)", + "type": "integer", + "format": "int32", + "default": 0 + }, + "sockets": { + "description": "Sockets is the number of sockets for a VM. Total CPUs is (Sockets * Cores)", + "type": "integer", + "format": "int32", + "default": 0 + }, + "threads": { + "description": "Threads is the number of CPU threads.", + "type": "integer", + "format": "int32", + "default": 0 + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "ovirt", + "Kind": "CPU", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.ovirt.Disk": { + "description": "Disk defines a VM disk", + "type": "object", + "required": [ + "sizeGB" + ], + "properties": { + "sizeGB": { + "description": "SizeGB size of the bootable disk in GiB.", + "type": "integer", + "format": "int64", + "default": 0 + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "ovirt", + "Kind": "Disk", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.ovirt.MachinePool": { + "description": "MachinePool stores the configuration for a machine pool installed on ovirt.", + "type": "object", + "properties": { + "affinityGroupsNames": { + "description": "AffinityGroupsNames contains a list of oVirt affinity group names that the newly created machines will join. The affinity groups should exist on the oVirt cluster or created by the OpenShift installer.", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "autoPinningPolicy": { + "description": "AutoPinningPolicy defines the policy to automatically set the CPU and NUMA including pinning to the host for the instance. When the field is omitted the default will be \"none\".", + "type": "string" + }, + "clone": { + "description": "Clone makes sure that the disks are cloned from the template and are not linked. Defaults to true for high performance and server VM types, false for desktop types.\n\nNote: this option is not documented in the OpenShift documentation. This is intentional as it has sane defaults that shouldn't be changed unless needed for debugging or resolving issues in cooperation with Red Hat support.", + "type": "boolean" + }, + "cpu": { + "description": "CPU defines the VM CPU.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.ovirt.CPU" + }, + "format": { + "description": "Format is the disk format that the disks are in. Can be \"cow\" or \"raw\". \"raw\" disables several features that may be needed, such as incremental backups.", + "type": "string" + }, + "hugepages": { + "description": "Hugepages is the size of a VM's hugepages to use in KiBs.", + "type": "integer", + "format": "int32" + }, + "instanceTypeID": { + "description": "InstanceTypeID defines the VM instance type and overrides the hardware parameters of the created VM, including cpu and memory. If InstanceTypeID is passed, all memory and cpu variables will be ignored.", + "type": "string" + }, + "memoryMB": { + "description": "MemoryMB is the size of a VM's memory in MiBs.", + "type": "integer", + "format": "int32" + }, + "osDisk": { + "description": "OSDisk is the the root disk of the node.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.ovirt.Disk" + }, + "sparse": { + "description": "Sparse indicates that sparse provisioning should be used and disks should be not preallocated.", + "type": "boolean" + }, + "vmType": { + "description": "VMType defines the workload type of the VM.", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "ovirt", + "Kind": "MachinePool", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.ovirt.Metadata": { + "description": "Metadata contains ovirt metadata (e.g. for uninstalling the cluster).", + "type": "object", + "required": [ + "cluster_id", + "remove_template" + ], + "properties": { + "cluster_id": { + "type": "string", + "default": "" + }, + "remove_template": { + "type": "boolean", + "default": false + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "ovirt", + "Kind": "Metadata", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.ovirt.Platform": { + "description": "Platform stores all the global configuration that all machinesets use.", + "type": "object", + "required": [ + "ovirt_cluster_id", + "ovirt_storage_domain_id" + ], + "properties": { + "affinityGroups": { + "description": "AffinityGroups contains the RHV affinity groups that the installer will create.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.ovirt.AffinityGroup" + } + }, + "api_vip": { + "description": "DeprecatedAPIVIP is an IP which will be served by bootstrap and then pivoted masters, using keepalived Deprecated: Use APIVIPs", + "type": "string" + }, + "api_vips": { + "description": "APIVIPs contains the VIP(s) which will be served by bootstrap and then pivoted masters, using keepalived. In dual stack clusters it contains an IPv4 and IPv6 address, otherwise only one VIP", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "defaultMachinePlatform": { + "description": "DefaultMachinePlatform is the default configuration used when installing on ovirt for machine pools which do not define their own platform configuration. Default will set the image field to the latest RHCOS image.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.ovirt.MachinePool" + }, + "ingress_vip": { + "description": "IngressIP is an external IP which routes to the default ingress controller. The IP is a suitable target of a wildcard DNS record used to resolve default route host names. Deprecated: Use IngressVIPs", + "type": "string" + }, + "ingress_vips": { + "description": "IngressVIPs are external IP(s) which route to the default ingress controller. The VIPs are suitable targets of wildcard DNS records used to resolve default route host names. In dual stack clusters it contains an IPv4 and IPv6 address, otherwise only one VIP", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "loadBalancer": { + "description": "LoadBalancer defines how the load balancer used by the cluster is configured. LoadBalancer is available in TechPreview.", + "$ref": "#/definitions/io.openshift.config.v1.OvirtPlatformLoadBalancer" + }, + "ovirt_cluster_id": { + "description": "The target cluster under which all VMs will run", + "type": "string", + "default": "" + }, + "ovirt_network_name": { + "description": "NetworkName is the target network of all the network interfaces of the nodes. When no ovirt_network_name is provided it defaults to `ovirtmgmt` network, which is a default network for every ovirt cluster.", + "type": "string" + }, + "ovirt_storage_domain_id": { + "description": "The target storage domain under which all VM disk would be created.", + "type": "string", + "default": "" + }, + "vnicProfileID": { + "description": "VNICProfileID defines the VNIC profile ID to use the the VM network interfaces. When no vnicProfileID is provided it will be set to the profile of the network. If there are multiple profiles for the network, the installer requires you to explicitly set the vnicProfileID.", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "ovirt", + "Kind": "Platform", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.powervs.MachinePool": { + "description": "MachinePool stores the configuration for a machine pool installed on IBM Power VS.", + "type": "object", + "properties": { + "memoryGiB": { + "description": "memoryGiB is the size of a virtual machine's memory, in GiB.", + "type": "integer", + "format": "int32" + }, + "procType": { + "description": "ProcType defines the processor sharing model for the instance. Must be one of {Capped, Dedicated, Shared}.", + "type": "string" + }, + "processors": { + "description": "Processors defines the processing units for the instance.", + "$ref": "#/definitions/io.k8s.apimachinery.pkg.util.intstr.IntOrString" + }, + "smtLevel": { + "description": "SMTLevel specifies the level of SMT to set the control plane and worker nodes to.", + "type": "string" + }, + "sysType": { + "description": "SysType defines the system type for instance.", + "type": "string" + }, + "volumeIDs": { + "description": "VolumeIDs is the list of volumes attached to the instance.", + "type": "array", + "items": { + "type": "string", + "default": "" + } + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "powervs", + "Kind": "MachinePool", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.powervs.Metadata": { + "description": "Metadata contains Power VS metadata (e.g. for uninstalling the cluster).", + "type": "object", + "required": [ + "BaseDomain", + "cisInstanceCRN", + "dnsInstanceCRN", + "powerVSResourceGroup", + "region", + "vpcRegion", + "zone", + "serviceInstanceGUID", + "transitGatewayName" + ], + "properties": { + "BaseDomain": { + "type": "string", + "default": "" + }, + "cisInstanceCRN": { + "type": "string", + "default": "" + }, + "dnsInstanceCRN": { + "type": "string", + "default": "" + }, + "powerVSResourceGroup": { + "type": "string", + "default": "" + }, + "region": { + "type": "string", + "default": "" + }, + "serviceEndpoints": { + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.PowerVSServiceEndpoint" + } + }, + "serviceInstanceGUID": { + "type": "string", + "default": "" + }, + "transitGatewayName": { + "type": "string", + "default": "" + }, + "vpcRegion": { + "type": "string", + "default": "" + }, + "zone": { + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "powervs", + "Kind": "Metadata", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.powervs.Platform": { + "description": "Platform stores all the global configuration that all machinesets use.", + "type": "object", + "required": [ + "powervsResourceGroup", + "zone", + "userID" + ], + "properties": { + "clusterOSImage": { + "description": "ClusterOSImage is a pre-created Power VS boot image that overrides the default image for cluster nodes.", + "type": "string" + }, + "defaultMachinePlatform": { + "description": "DefaultMachinePlatform is the default configuration used when installing on Power VS for machine pools which do not define their own platform configuration.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.powervs.MachinePool" + }, + "powervsResourceGroup": { + "description": "PowerVSResourceGroup is the resource group in which Power VS resources will be created.", + "type": "string", + "default": "" + }, + "region": { + "description": "Region specifies the IBM Cloud colo region where the cluster will be created.", + "type": "string" + }, + "serviceEndpoints": { + "description": "ServiceEndpoints is a list which contains custom endpoints to override default service endpoints of IBM Cloud Services. There must only be one ServiceEndpoint for a service (no duplicates).", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.config.v1.PowerVSServiceEndpoint" + } + }, + "serviceInstanceGUID": { + "description": "ServiceInstanceGUID is the GUID of the Power IAAS instance created from the IBM Cloud Catalog before the cluster is completed. Leave unset to allow the installer to create a service instance during cluster creation.", + "type": "string" + }, + "tgName": { + "description": "TGName is the name of a pre-created TransitGateway inside IBM Cloud.", + "type": "string" + }, + "userID": { + "description": "UserID is the login for the user's IBM Cloud account.", + "type": "string", + "default": "" + }, + "vpcName": { + "description": "VPCName is the name of a pre-created VPC inside IBM Cloud.", + "type": "string" + }, + "vpcRegion": { + "description": "VPCRegion specifies the IBM Cloud region in which to create VPC resources. Leave unset to allow installer to select the closest VPC region.", + "type": "string" + }, + "vpcSubnets": { + "description": "VPCSubnets specifies existing subnets (by ID) where cluster resources will be created. Leave unset to have the installer create subnets in a new VPC on your behalf.", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "zone": { + "description": "Zone specifies the IBM Cloud colo region where the cluster will be created. At this time, only single-zone clusters are supported.", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "powervs", + "Kind": "Platform", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.powervs.Region": { + "description": "Region describes resources associated with a region in Power VS. We're using a few items from the IBM Cloud VPC offering. The region names for VPC are different so another function of this is to correlate those.", + "type": "object", + "required": [ + "Description", + "VPCRegion", + "COSRegion", + "Zones", + "SysTypes", + "VPCZones" + ], + "properties": { + "COSRegion": { + "type": "string", + "default": "" + }, + "Description": { + "type": "string", + "default": "" + }, + "SysTypes": { + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "VPCRegion": { + "type": "string", + "default": "" + }, + "VPCZones": { + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "Zones": { + "type": "array", + "items": { + "type": "string", + "default": "" + } + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "powervs", + "Kind": "Region", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.vsphere.FailureDomain": { + "description": "FailureDomain holds the region and zone failure domain and the vCenter topology of that failure domain.", + "type": "object", + "required": [ + "name", + "region", + "zone", + "server", + "topology" + ], + "properties": { + "name": { + "description": "name defines the name of the FailureDomain This name is arbitrary but will be used in VSpherePlatformDeploymentZone for association.", + "type": "string", + "default": "" + }, + "region": { + "description": "region defines a FailureDomainCoordinate which includes the name of the vCenter tag, the failure domain type and the name of the vCenter tag category.", + "type": "string", + "default": "" + }, + "server": { + "description": "server is the fully-qualified domain name or the IP address of the vCenter server.", + "type": "string", + "default": "" + }, + "topology": { + "description": "Topology describes a given failure domain using vSphere constructs", + "default": {}, + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.vsphere.Topology" + }, + "zone": { + "description": "zone defines a VSpherePlatformFailureDomain which includes the name of the vCenter tag, the failure domain type and the name of the vCenter tag category.", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "vsphere", + "Kind": "FailureDomain", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.vsphere.Host": { + "description": "Host defines host VMs to generate as part of the installation.", + "type": "object", + "required": [ + "networkDevice", + "role" + ], + "properties": { + "failureDomain": { + "description": "FailureDomain refers to the name of a FailureDomain as described in https://github.com/openshift/enhancements/blob/master/enhancements/installer/vsphere-ipi-zonal.md", + "type": "string", + "default": "" + }, + "networkDevice": { + "description": "NetworkDeviceSpec to be applied to the host", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.vsphere.NetworkDeviceSpec" + }, + "role": { + "description": "Role defines the role of the node", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "vsphere", + "Kind": "Host", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.vsphere.MachinePool": { + "description": "MachinePool stores the configuration for a machine pool installed on vSphere.", + "type": "object", + "properties": { + "coresPerSocket": { + "description": "NumCoresPerSocket is the number of cores per socket in a vm. The number of vCPUs on the vm will be NumCPUs/NumCoresPerSocket.", + "type": "integer", + "format": "int32", + "default": 0 + }, + "cpus": { + "description": "NumCPUs is the total number of virtual processor cores to assign a vm.", + "type": "integer", + "format": "int32", + "default": 0 + }, + "memoryMB": { + "description": "Memory is the size of a VM's memory in MB.", + "type": "integer", + "format": "int64", + "default": 0 + }, + "osDisk": { + "description": "OSDisk defines the storage for instance.", + "default": {}, + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.vsphere.OSDisk" + }, + "zones": { + "description": "Zones defines available zones Zones is available in TechPreview.", + "type": "array", + "items": { + "type": "string", + "default": "" + } + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "vsphere", + "Kind": "MachinePool", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.vsphere.Metadata": { + "description": "Metadata contains vSphere metadata (e.g. for uninstalling the cluster).", + "type": "object", + "required": [ + "terraform_platform", + "VCenters" + ], + "properties": { + "VCenters": { + "description": "VCenters collection of vcenters when multi vcenter support is enabled", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.vsphere.VCenters" + } + }, + "password": { + "description": "Password is the password for the user to use to connect to the vCenter.", + "type": "string" + }, + "terraform_platform": { + "description": "TerraformPlatform is the type...", + "type": "string", + "default": "" + }, + "username": { + "description": "Username is the name of the user to use to connect to the vCenter.", + "type": "string" + }, + "vCenter": { + "description": "VCenter is the domain name or IP address of the vCenter.", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "vsphere", + "Kind": "Metadata", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.vsphere.NetworkDeviceSpec": { + "description": "NetworkDeviceSpec defines network config for static IP assignment.", + "type": "object", + "required": [ + "ipAddrs" + ], + "properties": { + "gateway": { + "description": "gateway is an IPv4 or IPv6 address which represents the subnet gateway, for example, 192.168.1.1.", + "type": "string" + }, + "ipAddrs": { + "description": "ipAddrs is a list of one or more IPv4 and/or IPv6 addresses and CIDR to assign to this device, for example, 192.168.1.100/24. IP addresses provided via ipAddrs are intended to allow explicit assignment of a machine's IP address.", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "nameservers": { + "description": "nameservers is a list of IPv4 and/or IPv6 addresses used as DNS nameservers, for example, 8.8.8.8. a nameserver is not provided by a fulfilled IPAddressClaim. If DHCP is not the source of IP addresses for this network device, nameservers should include a valid nameserver.", + "type": "array", + "items": { + "type": "string", + "default": "" + } + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "vsphere", + "Kind": "NetworkDeviceSpec", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.vsphere.OSDisk": { + "description": "OSDisk defines the disk for a virtual machine.", + "type": "object", + "properties": { + "diskSizeGB": { + "description": "DiskSizeGB defines the size of disk in GB.", + "type": "integer", + "format": "int32", + "default": 0 + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "vsphere", + "Kind": "OSDisk", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.vsphere.Platform": { + "description": "Platform stores any global configuration used for vsphere platforms.", + "type": "object", + "properties": { + "apiVIP": { + "description": "DeprecatedAPIVIP is the virtual IP address for the api endpoint Deprecated: Use APIVIPs", + "type": "string" + }, + "apiVIPs": { + "description": "APIVIPs contains the VIP(s) for the api endpoint. In dual stack clusters it contains an IPv4 and IPv6 address, otherwise only one VIP", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "cluster": { + "description": "Cluster is the name of the cluster virtual machines will be cloned into. Deprecated: Use FailureDomains.Topology.Cluster", + "type": "string" + }, + "clusterOSImage": { + "description": "ClusterOSImage overrides the url provided in rhcos.json to download the RHCOS OVA", + "type": "string" + }, + "datacenter": { + "description": "Datacenter is the name of the datacenter to use in the vCenter. Deprecated: Use FailureDomains.Topology.Datacenter", + "type": "string" + }, + "defaultDatastore": { + "description": "DefaultDatastore is the default datastore to use for provisioning volumes. Deprecated: Use FailureDomains.Topology.Datastore", + "type": "string" + }, + "defaultMachinePlatform": { + "description": "DefaultMachinePlatform is the default configuration used when installing on VSphere for machine pools which do not define their own platform configuration.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.vsphere.MachinePool" + }, + "diskType": { + "description": "DiskType is the name of the disk provisioning type, valid values are thin, thick, and eagerZeroedThick. When not specified, it will be set according to the default storage policy of vsphere.", + "type": "string" + }, + "failureDomains": { + "description": "FailureDomains holds the VSpherePlatformFailureDomainSpec which contains the definition of region, zone and the vCenter topology. If this is omitted failure domains (regions and zones) will not be used.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.vsphere.FailureDomain" + } + }, + "folder": { + "description": "Folder is the absolute path of the folder that will be used and/or created for virtual machines. The absolute path is of the form /\u003cdatacenter\u003e/vm/\u003cfolder\u003e/\u003csubfolder\u003e. Deprecated: Use FailureDomains.Topology.Folder", + "type": "string" + }, + "hosts": { + "description": "Hosts defines network configurations to be applied by the installer. Hosts is available in TechPreview.", + "type": "array", + "items": { + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.vsphere.Host" + } + }, + "ingressVIP": { + "description": "DeprecatedIngressVIP is the virtual IP address for ingress Deprecated: Use IngressVIPs", + "type": "string" + }, + "ingressVIPs": { + "description": "IngressVIPs contains the VIP(s) for ingress. In dual stack clusters it contains an IPv4 and IPv6 address, otherwise only one VIP", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "loadBalancer": { + "description": "LoadBalancer defines how the load balancer used by the cluster is configured. LoadBalancer is available in TechPreview.", + "$ref": "#/definitions/io.openshift.config.v1.VSpherePlatformLoadBalancer" + }, + "network": { + "description": "Network specifies the name of the network to be used by the cluster. Deprecated: Use FailureDomains.Topology.Network", + "type": "string" + }, + "nodeNetworking": { + "description": "nodeNetworking contains the definition of internal and external network constraints for assigning the node's networking. If this field is omitted, networking defaults to the legacy address selection behavior which is to only support a single address and return the first one found.", + "$ref": "#/definitions/io.openshift.config.v1.VSpherePlatformNodeNetworking" + }, + "password": { + "description": "Password is the password for the user to use to connect to the vCenter. Deprecated: Use VCenters.Password", + "type": "string" + }, + "resourcePool": { + "description": "ResourcePool is the absolute path of the resource pool where virtual machines will be created. The absolute path is of the form /\u003cdatacenter\u003e/host/\u003ccluster\u003e/Resources/\u003cresourcepool\u003e. Deprecated: Use FailureDomains.Topology.ResourcePool", + "type": "string" + }, + "username": { + "description": "Username is the name of the user to use to connect to the vCenter. Deprecated: Use VCenters.Username", + "type": "string" + }, + "vCenter": { + "description": "VCenter is the domain name or IP address of the vCenter. Deprecated: Use VCenters.Server", + "type": "string" + }, + "vcenters": { + "description": "VCenters holds the connection details for services to communicate with vCenter. Currently only a single vCenter is supported.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.vsphere.VCenter" + } + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "vsphere", + "Kind": "Platform", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.vsphere.Topology": { + "description": "Topology holds the required and optional vCenter objects - datacenter, computeCluster, networks, datastore and resourcePool - to provision virtual machines.", + "type": "object", + "required": [ + "datacenter", + "computeCluster", + "datastore" + ], + "properties": { + "computeCluster": { + "description": "computeCluster as the failure domain This is required to be a path", + "type": "string", + "default": "" + }, + "datacenter": { + "description": "datacenter is the vCenter datacenter in which virtual machines will be located and defined as the failure domain.", + "type": "string", + "default": "" + }, + "datastore": { + "description": "datastore is the name or inventory path of the datastore in which the virtual machine is created/located.", + "type": "string", + "default": "" + }, + "folder": { + "description": "folder is the inventory path of the folder in which the virtual machine is created/located.", + "type": "string" + }, + "networks": { + "description": "networks is the list of networks within this failure domain", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "resourcePool": { + "description": "resourcePool is the absolute path of the resource pool where virtual machines will be created. The absolute path is of the form /\u003cdatacenter\u003e/host/\u003ccluster\u003e/Resources/\u003cresourcepool\u003e.", + "type": "string" + }, + "tagIDs": { + "description": "tagIDs is an optional set of tags to add to an instance. Specified tagIDs must use URN-notation instead of display names. A maximum of 10 tag IDs may be specified.", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "template": { + "description": "template is the inventory path of the virtual machine or template that will be used for cloning.", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "vsphere", + "Kind": "Topology", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.vsphere.VCenter": { + "description": "VCenter stores the vCenter connection fields https://github.com/kubernetes/cloud-provider-vsphere/blob/master/pkg/common/config/types_yaml.go", + "type": "object", + "required": [ + "server", + "user", + "password", + "datacenters" + ], + "properties": { + "datacenters": { + "description": "Datacenter in which VMs are located.", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "password": { + "description": "Password is the password for the user to use to connect to the vCenter.", + "type": "string", + "default": "" + }, + "port": { + "description": "port is the TCP port that will be used to communicate to the vCenter endpoint. This is typically unchanged from the default of HTTPS TCP/443.", + "type": "integer", + "format": "int32" + }, + "server": { + "description": "server is the fully-qualified domain name or the IP address of the vCenter server.", + "type": "string", + "default": "" + }, + "user": { + "description": "Username is the username that will be used to connect to vCenter", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "vsphere", + "Kind": "VCenter", + "Scope": "Namespaced" + } + }, + "com.github.openshift.installer.pkg.types.vsphere.VCenters": { + "description": "VCenters contains information on individual vcenter.", + "type": "object", + "required": [ + "vCenter", + "username", + "password" + ], + "properties": { + "password": { + "description": "Password is the password for the user to use to connect to the vCenter.", + "type": "string", + "default": "" + }, + "username": { + "description": "Username is the name of the user to use to connect to the vCenter.", + "type": "string", + "default": "" + }, + "vCenter": { + "description": "VCenter is the domain name or IP address of the vCenter.", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "", + "Version": "vsphere", + "Kind": "VCenters", + "Scope": "Namespaced" + } + }, "io.k8s.api.admission.v1.AdmissionRequest": { "description": "AdmissionRequest describes the admission.Attributes for the admission request.", "type": "object", @@ -17158,8 +20653,13 @@ "x-kubernetes-list-type": "atomic" }, "scope": { - "description": "scope specifies the scope of this rule. Valid values are \"Cluster\", \"Namespaced\", and \"*\" \"Cluster\" means that only cluster-scoped resources will match this rule. Namespace API objects are cluster-scoped. \"Namespaced\" means that only namespaced resources will match this rule. \"*\" means that there are no scope restrictions. Subresources match the scope of their parent resource. Default is \"*\".", - "type": "string" + "description": "scope specifies the scope of this rule. Valid values are \"Cluster\", \"Namespaced\", and \"*\" \"Cluster\" means that only cluster-scoped resources will match this rule. Namespace API objects are cluster-scoped. \"Namespaced\" means that only namespaced resources will match this rule. \"*\" means that there are no scope restrictions. Subresources match the scope of their parent resource. Default is \"*\".\n\n\nPossible enum values:\n - `\"*\"` means that all scopes are included.\n - `\"Cluster\"` means that scope is limited to cluster-scoped objects. Namespace objects are cluster-scoped.\n - `\"Namespaced\"` means that scope is limited to namespaced objects.", + "type": "string", + "enum": [ + "*", + "Cluster", + "Namespaced" + ] } }, "x-fabric8-info": { @@ -17255,8 +20755,13 @@ "x-kubernetes-list-type": "atomic" }, "scope": { - "description": "scope specifies the scope of this rule. Valid values are \"Cluster\", \"Namespaced\", and \"*\" \"Cluster\" means that only cluster-scoped resources will match this rule. Namespace API objects are cluster-scoped. \"Namespaced\" means that only namespaced resources will match this rule. \"*\" means that there are no scope restrictions. Subresources match the scope of their parent resource. Default is \"*\".", - "type": "string" + "description": "scope specifies the scope of this rule. Valid values are \"Cluster\", \"Namespaced\", and \"*\" \"Cluster\" means that only cluster-scoped resources will match this rule. Namespace API objects are cluster-scoped. \"Namespaced\" means that only namespaced resources will match this rule. \"*\" means that there are no scope restrictions. Subresources match the scope of their parent resource. Default is \"*\".\n\n\nPossible enum values:\n - `\"*\"` means that all scopes are included.\n - `\"Cluster\"` means that scope is limited to cluster-scoped objects. Namespace objects are cluster-scoped.\n - `\"Namespaced\"` means that scope is limited to namespaced objects.", + "type": "string", + "enum": [ + "*", + "Cluster", + "Namespaced" + ] } }, "x-fabric8-info": { @@ -17315,8 +20820,13 @@ "x-kubernetes-list-type": "atomic" }, "scope": { - "description": "scope specifies the scope of this rule. Valid values are \"Cluster\", \"Namespaced\", and \"*\" \"Cluster\" means that only cluster-scoped resources will match this rule. Namespace API objects are cluster-scoped. \"Namespaced\" means that only namespaced resources will match this rule. \"*\" means that there are no scope restrictions. Subresources match the scope of their parent resource. Default is \"*\".", - "type": "string" + "description": "scope specifies the scope of this rule. Valid values are \"Cluster\", \"Namespaced\", and \"*\" \"Cluster\" means that only cluster-scoped resources will match this rule. Namespace API objects are cluster-scoped. \"Namespaced\" means that only namespaced resources will match this rule. \"*\" means that there are no scope restrictions. Subresources match the scope of their parent resource. Default is \"*\".\n\n\nPossible enum values:\n - `\"*\"` means that all scopes are included.\n - `\"Cluster\"` means that scope is limited to cluster-scoped objects. Namespace objects are cluster-scoped.\n - `\"Namespaced\"` means that scope is limited to namespaced objects.", + "type": "string", + "enum": [ + "*", + "Cluster", + "Namespaced" + ] } }, "x-fabric8-info": { @@ -18123,8 +21633,13 @@ "x-kubernetes-list-type": "atomic" }, "scope": { - "description": "scope specifies the scope of this rule. Valid values are \"Cluster\", \"Namespaced\", and \"*\" \"Cluster\" means that only cluster-scoped resources will match this rule. Namespace API objects are cluster-scoped. \"Namespaced\" means that only namespaced resources will match this rule. \"*\" means that there are no scope restrictions. Subresources match the scope of their parent resource. Default is \"*\".", - "type": "string" + "description": "scope specifies the scope of this rule. Valid values are \"Cluster\", \"Namespaced\", and \"*\" \"Cluster\" means that only cluster-scoped resources will match this rule. Namespace API objects are cluster-scoped. \"Namespaced\" means that only namespaced resources will match this rule. \"*\" means that there are no scope restrictions. Subresources match the scope of their parent resource. Default is \"*\".\n\n\nPossible enum values:\n - `\"*\"` means that all scopes are included.\n - `\"Cluster\"` means that scope is limited to cluster-scoped objects. Namespace objects are cluster-scoped.\n - `\"Namespaced\"` means that scope is limited to namespaced objects.", + "type": "string", + "enum": [ + "*", + "Cluster", + "Namespaced" + ] } }, "x-fabric8-info": { @@ -18910,8 +22425,13 @@ "x-kubernetes-list-type": "atomic" }, "scope": { - "description": "scope specifies the scope of this rule. Valid values are \"Cluster\", \"Namespaced\", and \"*\" \"Cluster\" means that only cluster-scoped resources will match this rule. Namespace API objects are cluster-scoped. \"Namespaced\" means that only namespaced resources will match this rule. \"*\" means that there are no scope restrictions. Subresources match the scope of their parent resource. Default is \"*\".", - "type": "string" + "description": "scope specifies the scope of this rule. Valid values are \"Cluster\", \"Namespaced\", and \"*\" \"Cluster\" means that only cluster-scoped resources will match this rule. Namespace API objects are cluster-scoped. \"Namespaced\" means that only namespaced resources will match this rule. \"*\" means that there are no scope restrictions. Subresources match the scope of their parent resource. Default is \"*\".\n\n\nPossible enum values:\n - `\"*\"` means that all scopes are included.\n - `\"Cluster\"` means that scope is limited to cluster-scoped objects. Namespace objects are cluster-scoped.\n - `\"Namespaced\"` means that scope is limited to namespaced objects.", + "type": "string", + "enum": [ + "*", + "Cluster", + "Namespaced" + ] } }, "x-fabric8-info": { @@ -85084,6 +88604,694 @@ "Scope": "Namespaced" } }, + "io.openshift.install.v1.BootstrapInPlace": { + "description": "BootstrapInPlace defines the configuration for bootstrap-in-place installation", + "type": "object", + "required": [ + "installationDisk" + ], + "properties": { + "installationDisk": { + "description": "InstallationDisk is the target disk drive for coreos-installer", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "install.openshift.io", + "Version": "v1", + "Kind": "BootstrapInPlace", + "Scope": "Namespaced" + } + }, + "io.openshift.install.v1.Capabilities": { + "description": "Capabilities selects the managed set of optional, core cluster components.", + "type": "object", + "properties": { + "additionalEnabledCapabilities": { + "description": "additionalEnabledCapabilities extends the set of managed capabilities beyond the baseline defined in baselineCapabilitySet. The default is an empty set.", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "baselineCapabilitySet": { + "description": "baselineCapabilitySet selects an initial set of optional capabilities to enable, which can be extended via additionalEnabledCapabilities. The default is vCurrent.", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "install.openshift.io", + "Version": "v1", + "Kind": "Capabilities", + "Scope": "Namespaced" + } + }, + "io.openshift.install.v1.ClusterMetadata": { + "description": "ClusterMetadata contains information regarding the cluster that was created by installer.", + "type": "object", + "required": [ + "clusterName", + "clusterID", + "infraID", + "featureSet", + "customFeatureSet" + ], + "properties": { + "aws": { + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.aws.Metadata" + }, + "azure": { + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.azure.Metadata" + }, + "baremetal": { + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.baremetal.Metadata" + }, + "clusterID": { + "description": "ClusterID is a globally unique ID that is used to identify an Openshift cluster.", + "type": "string", + "default": "" + }, + "clusterName": { + "description": "ClusterName is the name for the cluster.", + "type": "string", + "default": "" + }, + "customFeatureSet": { + "$ref": "#/definitions/io.openshift.config.v1.CustomFeatureGates" + }, + "featureSet": { + "type": "string", + "default": "" + }, + "gcp": { + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.gcp.Metadata" + }, + "ibmcloud": { + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.ibmcloud.Metadata" + }, + "infraID": { + "description": "InfraID is an ID that is used to identify cloud resources created by the installer.", + "type": "string", + "default": "" + }, + "nutanix": { + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.nutanix.Metadata" + }, + "openstack": { + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.openstack.Metadata" + }, + "ovirt": { + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.ovirt.Metadata" + }, + "powervs": { + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.powervs.Metadata" + }, + "vsphere": { + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.vsphere.Metadata" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "install.openshift.io", + "Version": "v1", + "Kind": "ClusterMetadata", + "Scope": "Namespaced" + } + }, + "io.openshift.install.v1.ClusterNetworkEntry": { + "description": "ClusterNetworkEntry is a single IP address block for pod IP blocks. IP blocks are allocated with size 2^HostSubnetLength.", + "type": "object", + "required": [ + "cidr" + ], + "properties": { + "cidr": { + "description": "CIDR is the IP block address pool.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.ipnet.IPNet" + }, + "hostPrefix": { + "description": "HostPrefix is the prefix size to allocate to each node from the CIDR. For example, 24 would allocate 2^8=256 adresses to each node. If this field is not used by the plugin, it can be left unset.", + "type": "integer", + "format": "int32" + }, + "hostSubnetLength": { + "description": "The size of blocks to allocate from the larger pool. This is the length in bits - so a 9 here will allocate a /23.", + "type": "integer", + "format": "int32" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "install.openshift.io", + "Version": "v1", + "Kind": "ClusterNetworkEntry", + "Scope": "Namespaced" + } + }, + "io.openshift.install.v1.ClusterPlatformMetadata": { + "description": "ClusterPlatformMetadata contains metadata for platfrom.", + "type": "object", + "properties": { + "aws": { + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.aws.Metadata" + }, + "azure": { + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.azure.Metadata" + }, + "baremetal": { + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.baremetal.Metadata" + }, + "gcp": { + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.gcp.Metadata" + }, + "ibmcloud": { + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.ibmcloud.Metadata" + }, + "nutanix": { + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.nutanix.Metadata" + }, + "openstack": { + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.openstack.Metadata" + }, + "ovirt": { + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.ovirt.Metadata" + }, + "powervs": { + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.powervs.Metadata" + }, + "vsphere": { + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.vsphere.Metadata" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "install.openshift.io", + "Version": "v1", + "Kind": "ClusterPlatformMetadata", + "Scope": "Namespaced" + } + }, + "io.openshift.install.v1.ClusterQuota": { + "description": "ClusterQuota contains the size, in cloud quota, of the cluster that was created by installer.", + "type": "object", + "properties": { + "gcp": { + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.gcp.QuotaUsage" + } + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "install.openshift.io", + "Version": "v1", + "Kind": "ClusterQuota", + "Scope": "Namespaced" + } + }, + "io.openshift.install.v1.ImageContentSource": { + "description": "ImageContentSource defines a list of sources/repositories that can be used to pull content. The field is deprecated. Please use imageDigestSources.", + "type": "object", + "required": [ + "source" + ], + "properties": { + "mirrors": { + "description": "Mirrors is one or more repositories that may also contain the same images.", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "source": { + "description": "Source is the repository that users refer to, e.g. in image pull specifications.", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "install.openshift.io", + "Version": "v1", + "Kind": "ImageContentSource", + "Scope": "Namespaced" + } + }, + "io.openshift.install.v1.ImageDigestSource": { + "description": "ImageDigestSource defines a list of sources/repositories that can be used to pull content.", + "type": "object", + "required": [ + "source" + ], + "properties": { + "mirrors": { + "description": "Mirrors is one or more repositories that may also contain the same images.", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "source": { + "description": "Source is the repository that users refer to, e.g. in image pull specifications.", + "type": "string", + "default": "" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "install.openshift.io", + "Version": "v1", + "Kind": "ImageDigestSource", + "Scope": "Namespaced" + } + }, + "io.openshift.install.v1.InstallConfig": { + "description": "InstallConfig is the configuration for an OpenShift install.", + "type": "object", + "required": [ + "metadata", + "baseDomain", + "platform", + "pullSecret" + ], + "properties": { + "additionalTrustBundle": { + "description": "AdditionalTrustBundle is a PEM-encoded X.509 certificate bundle that will be added to the nodes' trusted certificate store.", + "type": "string" + }, + "additionalTrustBundlePolicy": { + "description": "AdditionalTrustBundlePolicy determines when to add the AdditionalTrustBundle to the nodes' trusted certificate store. \"Proxyonly\" is the default. The field can be set to following specified values. \"Proxyonly\" : adds the AdditionalTrustBundle to nodes when http/https proxy is configured. \"Always\" : always adds AdditionalTrustBundle.", + "type": "string" + }, + "apiVersion": { + "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + "type": "string" + }, + "baseDomain": { + "description": "BaseDomain is the base domain to which the cluster should belong.", + "type": "string", + "default": "" + }, + "bootstrapInPlace": { + "description": "BootstrapInPlace is the configuration for installing a single node with bootstrap in place installation.", + "$ref": "#/definitions/io.openshift.install.v1.BootstrapInPlace" + }, + "capabilities": { + "description": "Capabilities configures the installation of optional core cluster components.", + "$ref": "#/definitions/io.openshift.install.v1.Capabilities" + }, + "compute": { + "description": "Compute is the configuration for the machines that comprise the compute nodes.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.install.v1.MachinePool" + } + }, + "controlPlane": { + "description": "ControlPlane is the configuration for the machines that comprise the control plane.", + "$ref": "#/definitions/io.openshift.install.v1.MachinePool" + }, + "cpuPartitioningMode": { + "description": "CPUPartitioning determines if a cluster should be setup for CPU workload partitioning at install time. When this field is set the cluster will be flagged for CPU Partitioning allowing users to segregate workloads to specific CPU Sets. This does not make any decisions on workloads it only configures the nodes to allow CPU Partitioning. The \"AllNodes\" value will setup all nodes for CPU Partitioning, the default is \"None\".", + "type": "string" + }, + "credentialsMode": { + "description": "CredentialsMode is used to explicitly set the mode with which CredentialRequests are satisfied.\n\nIf this field is set, then the installer will not attempt to query the cloud permissions before attempting installation. If the field is not set or empty, then the installer will perform its normal verification that the credentials provided are sufficient to perform an installation.\n\nThere are three possible values for this field, but the valid values are dependent upon the platform being used. \"Mint\": create new credentials with a subset of the overall permissions for each CredentialsRequest \"Passthrough\": copy the credentials with all of the overall permissions for each CredentialsRequest \"Manual\": CredentialsRequests must be handled manually by the user\n\nFor each of the following platforms, the field can set to the specified values. For all other platforms, the field must not be set. AWS: \"Mint\", \"Passthrough\", \"Manual\" Azure: \"Passthrough\", \"Manual\" AzureStack: \"Manual\" GCP: \"Mint\", \"Passthrough\", \"Manual\" IBMCloud: \"Manual\" PowerVS: \"Manual\" Nutanix: \"Manual\"", + "type": "string" + }, + "featureGates": { + "description": "FeatureGates enables a set of custom feature gates. May only be used in conjunction with FeatureSet \"CustomNoUpgrade\". Features may be enabled or disabled by providing a true or false value for the feature gate. E.g. \"featureGates\": [\"FeatureGate1=true\", \"FeatureGate2=false\"].", + "type": "array", + "items": { + "type": "string", + "default": "" + } + }, + "featureSet": { + "description": "FeatureSet enables features that are not part of the default feature set. Valid values are \"Default\", \"TechPreviewNoUpgrade\" and \"CustomNoUpgrade\". When omitted, the \"Default\" feature set is used.", + "type": "string" + }, + "fips": { + "description": "FIPS configures https://www.nist.gov/itl/fips-general-information", + "type": "boolean" + }, + "imageContentSources": { + "description": "ImageContentSources lists sources/repositories for the release-image content. The field is deprecated. Please use imageDigestSources.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.install.v1.ImageContentSource" + } + }, + "imageDigestSources": { + "description": "ImageDigestSources lists sources/repositories for the release-image content.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.install.v1.ImageDigestSource" + } + }, + "kind": { + "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + "type": "string" + }, + "metadata": { + "default": {}, + "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta" + }, + "networking": { + "description": "Networking is the configuration for the pod network provider in the cluster.", + "$ref": "#/definitions/io.openshift.install.v1.Networking" + }, + "operatorPublishingStrategy": { + "description": "OperatorPublishingStrategy controls the visibility of ingress and apiserver. Defaults to public.", + "$ref": "#/definitions/io.openshift.install.v1.OperatorPublishingStrategy" + }, + "platform": { + "description": "Platform is the configuration for the specific platform upon which to perform the installation.", + "default": {}, + "$ref": "#/definitions/io.openshift.install.v1.Platform" + }, + "proxy": { + "description": "Proxy defines the proxy settings for the cluster. If unset, the cluster will not be configured to use a proxy.", + "$ref": "#/definitions/io.openshift.install.v1.Proxy" + }, + "publish": { + "description": "Publish controls how the user facing endpoints of the cluster like the Kubernetes API, OpenShift routes etc. are exposed. When no strategy is specified, the strategy is \"External\".", + "type": "string" + }, + "pullSecret": { + "description": "PullSecret is the secret to use when pulling images.", + "type": "string", + "default": "" + }, + "sshKey": { + "description": "SSHKey is the public Secure Shell (SSH) key to provide access to instances.", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "object", + "Group": "install.openshift.io", + "Version": "v1", + "Kind": "InstallConfig", + "Scope": "Namespaced" + } + }, + "io.openshift.install.v1.MachineNetworkEntry": { + "description": "MachineNetworkEntry is a single IP address block for node IP blocks.", + "type": "object", + "required": [ + "cidr" + ], + "properties": { + "cidr": { + "description": "CIDR is the IP block address pool for machines within the cluster.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.ipnet.IPNet" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "install.openshift.io", + "Version": "v1", + "Kind": "MachineNetworkEntry", + "Scope": "Namespaced" + } + }, + "io.openshift.install.v1.MachinePool": { + "description": "MachinePool is a pool of machines to be installed.", + "type": "object", + "required": [ + "name", + "platform" + ], + "properties": { + "architecture": { + "description": "Architecture is the instruction set architecture of the machine pool. Defaults to amd64.", + "type": "string" + }, + "hyperthreading": { + "description": "Hyperthreading determines the mode of hyperthreading that machines in the pool will utilize. Default is for hyperthreading to be enabled.", + "type": "string" + }, + "name": { + "description": "Name is the name of the machine pool. For the control plane machine pool, the name will always be \"master\". For the compute machine pools, the only valid name is \"worker\".", + "type": "string", + "default": "" + }, + "platform": { + "description": "Platform is configuration for machine pool specific to the platform.", + "default": {}, + "$ref": "#/definitions/io.openshift.install.v1.MachinePoolPlatform" + }, + "replicas": { + "description": "Replicas is the machine count for the machine pool.", + "type": "integer", + "format": "int64" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "install.openshift.io", + "Version": "v1", + "Kind": "MachinePool", + "Scope": "Namespaced" + } + }, + "io.openshift.install.v1.MachinePoolPlatform": { + "description": "MachinePoolPlatform is the platform-specific configuration for a machine pool. Only one of the platforms should be set.", + "type": "object", + "properties": { + "aws": { + "description": "AWS is the configuration used when installing on AWS.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.aws.MachinePool" + }, + "azure": { + "description": "Azure is the configuration used when installing on Azure.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.azure.MachinePool" + }, + "baremetal": { + "description": "BareMetal is the configuration used when installing on bare metal.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.baremetal.MachinePool" + }, + "gcp": { + "description": "GCP is the configuration used when installing on GCP", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.gcp.MachinePool" + }, + "ibmcloud": { + "description": "IBMCloud is the configuration used when installing on IBM Cloud.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.ibmcloud.MachinePool" + }, + "nutanix": { + "description": "Nutanix is the configuration used when installing on Nutanix.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.nutanix.MachinePool" + }, + "openstack": { + "description": "OpenStack is the configuration used when installing on OpenStack.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.openstack.MachinePool" + }, + "ovirt": { + "description": "Ovirt is the configuration used when installing on oVirt.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.ovirt.MachinePool" + }, + "powervs": { + "description": "PowerVS is the configuration used when installing on IBM Power VS.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.powervs.MachinePool" + }, + "vsphere": { + "description": "VSphere is the configuration used when installing on vSphere.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.vsphere.MachinePool" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "install.openshift.io", + "Version": "v1", + "Kind": "MachinePoolPlatform", + "Scope": "Namespaced" + } + }, + "io.openshift.install.v1.Networking": { + "description": "Networking defines the pod network provider in the cluster.", + "type": "object", + "properties": { + "clusterNetwork": { + "description": "ClusterNetwork is the list of IP address pools for pods. Default is 10.128.0.0/14 and a host prefix of /23.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.install.v1.ClusterNetworkEntry" + } + }, + "clusterNetworkMTU": { + "description": "ClusterNetworkMTU is the Maximum Transmit (MTU) Unit size in bytes to allocate to the cluster network. For example, 1200 would set the MTU of the entire overlay network. If the deployment does not require changes in the network plugin, leave it unset and the MTU will be calculated automatically based on the host network MTU.", + "type": "integer", + "format": "int64" + }, + "clusterNetworks": { + "description": "Deprecated name for ClusterNetwork", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.install.v1.ClusterNetworkEntry" + } + }, + "machineCIDR": { + "description": "Deprecated way to configure an IP address pool for machines. Replaced by MachineNetwork which allows for multiple pools.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.ipnet.IPNet" + }, + "machineNetwork": { + "description": "MachineNetwork is the list of IP address pools for machines. This field replaces MachineCIDR, and if set MachineCIDR must be empty or match the first entry in the list. Default is 10.0.0.0/16 for all platforms other than Power VS. For Power VS, the default is 192.168.0.0/24.", + "type": "array", + "items": { + "default": {}, + "$ref": "#/definitions/io.openshift.install.v1.MachineNetworkEntry" + } + }, + "networkType": { + "description": "NetworkType is the type of network to install. The default value is OVNKubernetes.", + "type": "string" + }, + "serviceCIDR": { + "description": "Deprecated way to configure an IP address pool for services. Replaced by ServiceNetwork which allows for multiple pools.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.ipnet.IPNet" + }, + "serviceNetwork": { + "description": "ServiceNetwork is the list of IP address pools for services. Default is 172.30.0.0/16. NOTE: currently only one entry is supported.", + "type": "array", + "items": { + "$ref": "#/definitions/com.github.openshift.installer.pkg.ipnet.IPNet" + } + }, + "type": { + "description": "Deprecated name for NetworkType", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "install.openshift.io", + "Version": "v1", + "Kind": "Networking", + "Scope": "Namespaced" + } + }, + "io.openshift.install.v1.OperatorPublishingStrategy": { + "description": "OperatorPublishingStrategy is used to control the visibility of the components which can be used to have a mix of public and private resources.", + "type": "object", + "properties": { + "apiserver": { + "description": "APIServer sets the visibility of the load balancers servicing the APIserver.", + "type": "string" + }, + "ingress": { + "description": "Ingress sets the visibility of the created dns resources.", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "install.openshift.io", + "Version": "v1", + "Kind": "OperatorPublishingStrategy", + "Scope": "Namespaced" + } + }, + "io.openshift.install.v1.Platform": { + "description": "Platform is the configuration for the specific platform upon which to perform the installation. Only one of the platform configuration should be set.", + "type": "object", + "properties": { + "aws": { + "description": "AWS is the configuration used when installing on AWS.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.aws.Platform" + }, + "azure": { + "description": "Azure is the configuration used when installing on Azure.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.azure.Platform" + }, + "baremetal": { + "description": "BareMetal is the configuration used when installing on bare metal.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.baremetal.Platform" + }, + "external": { + "description": "External is the configuration used when installing on an external cloud provider.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.external.Platform" + }, + "gcp": { + "description": "GCP is the configuration used when installing on Google Cloud Platform.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.gcp.Platform" + }, + "ibmcloud": { + "description": "IBMCloud is the configuration used when installing on IBM Cloud.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.ibmcloud.Platform" + }, + "none": { + "description": "None is the empty configuration used when installing on an unsupported platform.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.none.Platform" + }, + "nutanix": { + "description": "Nutanix is the configuration used when installing on Nutanix.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.nutanix.Platform" + }, + "openstack": { + "description": "OpenStack is the configuration used when installing on OpenStack.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.openstack.Platform" + }, + "ovirt": { + "description": "Ovirt is the configuration used when installing on oVirt.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.ovirt.Platform" + }, + "powervs": { + "description": "PowerVS is the configuration used when installing on Power VS.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.powervs.Platform" + }, + "vsphere": { + "description": "VSphere is the configuration used when installing on vSphere.", + "$ref": "#/definitions/com.github.openshift.installer.pkg.types.vsphere.Platform" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "install.openshift.io", + "Version": "v1", + "Kind": "Platform", + "Scope": "Namespaced" + } + }, + "io.openshift.install.v1.Proxy": { + "description": "Proxy defines the proxy settings for the cluster. At least one of HTTPProxy or HTTPSProxy is required.", + "type": "object", + "properties": { + "httpProxy": { + "description": "HTTPProxy is the URL of the proxy for HTTP requests.", + "type": "string" + }, + "httpsProxy": { + "description": "HTTPSProxy is the URL of the proxy for HTTPS requests.", + "type": "string" + }, + "noProxy": { + "description": "NoProxy is a comma-separated list of domains and CIDRs for which the proxy should not be used.", + "type": "string" + } + }, + "x-fabric8-info": { + "Type": "nested", + "Group": "install.openshift.io", + "Version": "v1", + "Kind": "Proxy", + "Scope": "Namespaced" + } + }, "io.openshift.internal.security.v1.RangeAllocation": { "description": "RangeAllocation is used so we can easily expose a RangeAllocation typed for security group This is an internal API, not intended for external consumption.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).", "type": "object", diff --git a/kubernetes-model-generator/openshift-model-installer/Makefile b/kubernetes-model-generator/openshift-model-installer/Makefile deleted file mode 100644 index c09a7003874..00000000000 --- a/kubernetes-model-generator/openshift-model-installer/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-installer/cmd/generate/generate.go b/kubernetes-model-generator/openshift-model-installer/cmd/generate/generate.go deleted file mode 100644 index 7d0255a9771..00000000000 --- a/kubernetes-model-generator/openshift-model-installer/cmd/generate/generate.go +++ /dev/null @@ -1,131 +0,0 @@ -/** - * Copyright (C) 2015 Red Hat, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package main - -import ( - "bytes" - "encoding/json" - "fmt" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - runtime "k8s.io/apimachinery/pkg/runtime" - "log" - "reflect" - "strings" - "time" - - ipnet "github.com/openshift/installer/pkg/ipnet" - installer "github.com/openshift/installer/pkg/types" - alibabacloud "github.com/openshift/installer/pkg/types/alibabacloud" - aws "github.com/openshift/installer/pkg/types/aws" - azure "github.com/openshift/installer/pkg/types/azure" - baremetal "github.com/openshift/installer/pkg/types/baremetal" - gcp "github.com/openshift/installer/pkg/types/gcp" - ibmcloud "github.com/openshift/installer/pkg/types/ibmcloud" - libvirt "github.com/openshift/installer/pkg/types/libvirt" - openstack "github.com/openshift/installer/pkg/types/openstack" - ovirt "github.com/openshift/installer/pkg/types/ovirt" - vsphere "github.com/openshift/installer/pkg/types/vsphere" - v1apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" - intstr "k8s.io/apimachinery/pkg/util/intstr" - "os" - - "github.com/fabric8io/kubernetes-client/kubernetes-model-generator/pkg/schemagen" -) - -type Schema struct { - APIGroup metav1.APIGroup - APIGroupList metav1.APIGroupList - BaseKubernetesList metav1.List - ObjectMeta metav1.ObjectMeta - TypeMeta metav1.TypeMeta - Status metav1.Status - Patch metav1.Patch - Time metav1.Time - InstallConfig installer.InstallConfig - AlibabaCloudMachinePool alibabacloud.MachinePool - AwsMachinePool aws.MachinePool - AzureMachinePool azure.MachinePool - BaremetalMachinePool baremetal.MachinePool - GcpMachinePool gcp.MachinePool - IBMCloudMachinePool ibmcloud.MachinePool - LibvirtMachinePool libvirt.MachinePool - OpenStackMachinePool openstack.MachinePool - VSphereMachinePool vsphere.MachinePool - OvirtMachinePool ovirt.MachinePool -} - -func main() { - packages := []schemagen.PackageDescriptor{ - {"k8s.io/apimachinery/pkg/apis/meta/v1", "", "io.fabric8.kubernetes.api.model", "kubernetes_apimachinery_", false}, - {"github.com/openshift/api/config/v1", "", "io.fabric8.openshift.api.model.config.v1", "os_config_v1_", false}, - {"github.com/openshift/api/machine/v1alpha1", "", "io.fabric8.openshift.api.model.machine.v1alpha1", "os_machine_v1alpha1_", false}, - {"github.com/openshift/api/machine/v1", "", "io.fabric8.openshift.api.model.machine.v1", "os_machine_v1_", false}, - {"github.com/openshift/installer/pkg/types", "install", "io.fabric8.openshift.api.model.installer.v1", "os_installer_v1_", true}, - {"github.com/openshift/installer/pkg/ipnet", "", "io.fabric8.openshift.api.model.installer.ipnet.v1", "os_installer_ipnet_v1_", true}, - {"github.com/openshift/installer/pkg/types/alibabacloud", "", "io.fabric8.openshift.api.model.installer.alibabacloud.v1", "os_installer_alibabacloud_v1_", true}, - {"github.com/openshift/installer/pkg/types/aws", "", "io.fabric8.openshift.api.model.installer.aws.v1", "os_installer_aws_v1_", true}, - {"github.com/openshift/installer/pkg/types/azure", "", "io.fabric8.openshift.api.model.installer.azure.v1", "os_installer_azure_v1_", true}, - {"github.com/openshift/installer/pkg/types/baremetal", "", "io.fabric8.openshift.api.model.installer.baremetal.v1", "os_installer_baremetal_v1_", true}, - {"github.com/openshift/installer/pkg/types/gcp", "", "io.fabric8.openshift.api.model.installer.gcp.v1", "os_installer_gcp_v1_", true}, - {"github.com/openshift/installer/pkg/types/ibmcloud", "", "io.fabric8.openshift.api.model.installer.ibmcloud.v1", "os_installer_ibmcloud_v1_", true}, - {"github.com/openshift/installer/pkg/types/libvirt", "", "io.fabric8.openshift.api.model.installer.libvirt.v1", "os_installer_libvirt_v1_", true}, - {"github.com/openshift/installer/pkg/types/openstack", "", "io.fabric8.openshift.api.model.installer.openstack.v1", "os_installer_openstack_v1_", true}, - {"github.com/openshift/installer/pkg/types/vsphere", "", "io.fabric8.openshift.api.model.installer.vsphere.v1", "os_installer_vsphere_v1_", true}, - {"github.com/openshift/installer/pkg/types/ovirt", "", "io.fabric8.openshift.api.model.installer.ovirt.v1", "os_installer_ovirt_v1_", true}, - {"github.com/openshift/installer/pkg/types/none", "", "io.fabric8.openshift.api.model.installer.none.v1", "os_installer_none_v1_", true}, - {"github.com/openshift/installer/pkg/asset/installconfig", "", "io.fabric8.openshift.api.model.installer.asset.installconfig", "os_installer_asset_installconfig_", true}, - {"github.com/openshift/installer/pkg/types/powervs", "", "io.fabric8.openshift.api.model.installer.powervs.v1", "os_installer_powervs_v1_", true}, - {"github.com/openshift/installer/pkg/types/nutanix", "", "io.fabric8.openshift.api.model.installer.nutanix.v1", "os_installer_nutanix_v1_", true}, - } - - typeMap := map[reflect.Type]reflect.Type{ - reflect.TypeOf(time.Time{}): reflect.TypeOf(""), - reflect.TypeOf(struct{}{}): reflect.TypeOf(""), - reflect.TypeOf(ipnet.IPNet{}): reflect.TypeOf(""), - } - manualTypeMap := map[reflect.Type]string{ - reflect.TypeOf(runtime.RawExtension{}): "java.util.Map", - reflect.TypeOf(v1apiextensions.JSON{}): "com.fasterxml.jackson.databind.JsonNode", - reflect.TypeOf(intstr.IntOrString{}): "io.fabric8.kubernetes.api.model.IntOrString", - } - schema, err := schemagen.GenerateSchema(reflect.TypeOf(Schema{}), packages, typeMap, manualTypeMap, "installer") - if err != nil { - 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) - result = strings.Replace(result, "\"clusterNetworks\":", "\"deprecatedClusterNetworks\":", -1) - result = strings.Replace(result, "types", "v1", -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-installer/pom.xml b/kubernetes-model-generator/openshift-model-installer/pom.xml index 0beb6033aca..b40876b3f70 100644 --- a/kubernetes-model-generator/openshift-model-installer/pom.xml +++ b/kubernetes-model-generator/openshift-model-installer/pom.xml @@ -46,14 +46,6 @@ io.fabric8 kubernetes-model-core - - io.fabric8 - kubernetes-model-common - - - io.fabric8 - kubernetes-model-apiextensions - io.fabric8 openshift-model-config @@ -62,10 +54,6 @@ io.fabric8 openshift-model-machine - - io.fabric8 - kubernetes-model-admissionregistration - org.assertj assertj-core @@ -73,31 +61,48 @@ - - - - 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-generated} + + + io.fabric8.openshift.api.model.installer.aws.v1 + io.fabric8.openshift.api.model.installer.azure.v1 + io.fabric8.openshift.api.model.installer.baremetal.v1 + io.fabric8.openshift.api.model.installer.external.v1 + io.fabric8.openshift.api.model.installer.gcp.v1 + io.fabric8.openshift.api.model.installer.ibmcloud.v1 + io.fabric8.openshift.api.model.installer.none.v1 + io.fabric8.openshift.api.model.installer.nutanix.v1 + io.fabric8.openshift.api.model.installer.openstack.v1 + io.fabric8.openshift.api.model.installer.ovirt.v1 + io.fabric8.openshift.api.model.installer.powervs.v1 + io.fabric8.openshift.api.model.installer.vsphere.v1 + + + ^io\.openshift\.install\..*$ + ^com\.github\.openshift\.installer\..*$ + + + clusterNetworkList + + + + #/components/schemas/com.github.openshift.installer.pkg.ipnet.IPNet + java.lang.String + + + + diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java deleted file mode 100644 index 8ce785249b8..00000000000 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ /dev/null @@ -1,272 +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.openshift.api.model.installer.v1.InstallConfig; - -@Generated("jsonschema2pojo") -public class KubeSchema { - - private APIGroup aPIGroup; - private APIGroupList aPIGroupList; - private io.fabric8.openshift.api.model.installer.alibabacloud.v1.MachinePool alibabaCloudMachinePool; - private io.fabric8.openshift.api.model.installer.aws.v1.MachinePool awsMachinePool; - private io.fabric8.openshift.api.model.installer.azure.v1.MachinePool azureMachinePool; - private io.fabric8.openshift.api.model.installer.baremetal.v1.MachinePool baremetalMachinePool; - private KubernetesList baseKubernetesList; - private io.fabric8.openshift.api.model.installer.gcp.v1.MachinePool gcpMachinePool; - private io.fabric8.openshift.api.model.installer.ibmcloud.v1.MachinePool iBMCloudMachinePool; - private InstallConfig installConfig; - private io.fabric8.openshift.api.model.installer.libvirt.v1.MachinePool libvirtMachinePool; - private ObjectMeta objectMeta; - private io.fabric8.openshift.api.model.installer.openstack.v1.MachinePool openStackMachinePool; - private io.fabric8.openshift.api.model.installer.ovirt.v1.MachinePool ovirtMachinePool; - private Patch patch; - private Status status; - private String time; - private TypeMeta typeMeta; - private io.fabric8.openshift.api.model.installer.vsphere.v1.MachinePool vSphereMachinePool; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public KubeSchema() { - } - - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, io.fabric8.openshift.api.model.installer.alibabacloud.v1.MachinePool alibabaCloudMachinePool, io.fabric8.openshift.api.model.installer.aws.v1.MachinePool awsMachinePool, io.fabric8.openshift.api.model.installer.azure.v1.MachinePool azureMachinePool, io.fabric8.openshift.api.model.installer.baremetal.v1.MachinePool baremetalMachinePool, KubernetesList baseKubernetesList, io.fabric8.openshift.api.model.installer.gcp.v1.MachinePool gcpMachinePool, io.fabric8.openshift.api.model.installer.ibmcloud.v1.MachinePool iBMCloudMachinePool, InstallConfig installConfig, io.fabric8.openshift.api.model.installer.libvirt.v1.MachinePool libvirtMachinePool, ObjectMeta objectMeta, io.fabric8.openshift.api.model.installer.openstack.v1.MachinePool openStackMachinePool, io.fabric8.openshift.api.model.installer.ovirt.v1.MachinePool ovirtMachinePool, Patch patch, Status status, String time, TypeMeta typeMeta, io.fabric8.openshift.api.model.installer.vsphere.v1.MachinePool vSphereMachinePool) { - super(); - this.aPIGroup = aPIGroup; - this.aPIGroupList = aPIGroupList; - this.alibabaCloudMachinePool = alibabaCloudMachinePool; - this.awsMachinePool = awsMachinePool; - this.azureMachinePool = azureMachinePool; - this.baremetalMachinePool = baremetalMachinePool; - this.baseKubernetesList = baseKubernetesList; - this.gcpMachinePool = gcpMachinePool; - this.iBMCloudMachinePool = iBMCloudMachinePool; - this.installConfig = installConfig; - this.libvirtMachinePool = libvirtMachinePool; - this.objectMeta = objectMeta; - this.openStackMachinePool = openStackMachinePool; - this.ovirtMachinePool = ovirtMachinePool; - this.patch = patch; - this.status = status; - this.time = time; - this.typeMeta = typeMeta; - this.vSphereMachinePool = vSphereMachinePool; - } - - @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("AlibabaCloudMachinePool") - public io.fabric8.openshift.api.model.installer.alibabacloud.v1.MachinePool getAlibabaCloudMachinePool() { - return alibabaCloudMachinePool; - } - - @JsonProperty("AlibabaCloudMachinePool") - public void setAlibabaCloudMachinePool(io.fabric8.openshift.api.model.installer.alibabacloud.v1.MachinePool alibabaCloudMachinePool) { - this.alibabaCloudMachinePool = alibabaCloudMachinePool; - } - - @JsonProperty("AwsMachinePool") - public io.fabric8.openshift.api.model.installer.aws.v1.MachinePool getAwsMachinePool() { - return awsMachinePool; - } - - @JsonProperty("AwsMachinePool") - public void setAwsMachinePool(io.fabric8.openshift.api.model.installer.aws.v1.MachinePool awsMachinePool) { - this.awsMachinePool = awsMachinePool; - } - - @JsonProperty("AzureMachinePool") - public io.fabric8.openshift.api.model.installer.azure.v1.MachinePool getAzureMachinePool() { - return azureMachinePool; - } - - @JsonProperty("AzureMachinePool") - public void setAzureMachinePool(io.fabric8.openshift.api.model.installer.azure.v1.MachinePool azureMachinePool) { - this.azureMachinePool = azureMachinePool; - } - - @JsonProperty("BaremetalMachinePool") - public io.fabric8.openshift.api.model.installer.baremetal.v1.MachinePool getBaremetalMachinePool() { - return baremetalMachinePool; - } - - @JsonProperty("BaremetalMachinePool") - public void setBaremetalMachinePool(io.fabric8.openshift.api.model.installer.baremetal.v1.MachinePool baremetalMachinePool) { - this.baremetalMachinePool = baremetalMachinePool; - } - - @JsonProperty("BaseKubernetesList") - public KubernetesList getBaseKubernetesList() { - return baseKubernetesList; - } - - @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(KubernetesList baseKubernetesList) { - this.baseKubernetesList = baseKubernetesList; - } - - @JsonProperty("GcpMachinePool") - public io.fabric8.openshift.api.model.installer.gcp.v1.MachinePool getGcpMachinePool() { - return gcpMachinePool; - } - - @JsonProperty("GcpMachinePool") - public void setGcpMachinePool(io.fabric8.openshift.api.model.installer.gcp.v1.MachinePool gcpMachinePool) { - this.gcpMachinePool = gcpMachinePool; - } - - @JsonProperty("IBMCloudMachinePool") - public io.fabric8.openshift.api.model.installer.ibmcloud.v1.MachinePool getIBMCloudMachinePool() { - return iBMCloudMachinePool; - } - - @JsonProperty("IBMCloudMachinePool") - public void setIBMCloudMachinePool(io.fabric8.openshift.api.model.installer.ibmcloud.v1.MachinePool iBMCloudMachinePool) { - this.iBMCloudMachinePool = iBMCloudMachinePool; - } - - @JsonProperty("InstallConfig") - public InstallConfig getInstallConfig() { - return installConfig; - } - - @JsonProperty("InstallConfig") - public void setInstallConfig(InstallConfig installConfig) { - this.installConfig = installConfig; - } - - @JsonProperty("LibvirtMachinePool") - public io.fabric8.openshift.api.model.installer.libvirt.v1.MachinePool getLibvirtMachinePool() { - return libvirtMachinePool; - } - - @JsonProperty("LibvirtMachinePool") - public void setLibvirtMachinePool(io.fabric8.openshift.api.model.installer.libvirt.v1.MachinePool libvirtMachinePool) { - this.libvirtMachinePool = libvirtMachinePool; - } - - @JsonProperty("ObjectMeta") - public ObjectMeta getObjectMeta() { - return objectMeta; - } - - @JsonProperty("ObjectMeta") - public void setObjectMeta(ObjectMeta objectMeta) { - this.objectMeta = objectMeta; - } - - @JsonProperty("OpenStackMachinePool") - public io.fabric8.openshift.api.model.installer.openstack.v1.MachinePool getOpenStackMachinePool() { - return openStackMachinePool; - } - - @JsonProperty("OpenStackMachinePool") - public void setOpenStackMachinePool(io.fabric8.openshift.api.model.installer.openstack.v1.MachinePool openStackMachinePool) { - this.openStackMachinePool = openStackMachinePool; - } - - @JsonProperty("OvirtMachinePool") - public io.fabric8.openshift.api.model.installer.ovirt.v1.MachinePool getOvirtMachinePool() { - return ovirtMachinePool; - } - - @JsonProperty("OvirtMachinePool") - public void setOvirtMachinePool(io.fabric8.openshift.api.model.installer.ovirt.v1.MachinePool ovirtMachinePool) { - this.ovirtMachinePool = ovirtMachinePool; - } - - @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("VSphereMachinePool") - public io.fabric8.openshift.api.model.installer.vsphere.v1.MachinePool getVSphereMachinePool() { - return vSphereMachinePool; - } - - @JsonProperty("VSphereMachinePool") - public void setVSphereMachinePool(io.fabric8.openshift.api.model.installer.vsphere.v1.MachinePool vSphereMachinePool) { - this.vSphereMachinePool = vSphereMachinePool; - } - - @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-installer/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java deleted file mode 100644 index c3cf1cbdf2a..00000000000 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ /dev/null @@ -1,272 +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.openshift.api.model.installer.v1.InstallConfig; - -@Generated("jsonschema2pojo") -public class ValidationSchema { - - private APIGroup aPIGroup; - private APIGroupList aPIGroupList; - private io.fabric8.openshift.api.model.installer.alibabacloud.v1.MachinePool alibabaCloudMachinePool; - private io.fabric8.openshift.api.model.installer.aws.v1.MachinePool awsMachinePool; - private io.fabric8.openshift.api.model.installer.azure.v1.MachinePool azureMachinePool; - private io.fabric8.openshift.api.model.installer.baremetal.v1.MachinePool baremetalMachinePool; - private KubernetesList baseKubernetesList; - private io.fabric8.openshift.api.model.installer.gcp.v1.MachinePool gcpMachinePool; - private io.fabric8.openshift.api.model.installer.ibmcloud.v1.MachinePool iBMCloudMachinePool; - private InstallConfig installConfig; - private io.fabric8.openshift.api.model.installer.libvirt.v1.MachinePool libvirtMachinePool; - private ObjectMeta objectMeta; - private io.fabric8.openshift.api.model.installer.openstack.v1.MachinePool openStackMachinePool; - private io.fabric8.openshift.api.model.installer.ovirt.v1.MachinePool ovirtMachinePool; - private Patch patch; - private Status status; - private String time; - private TypeMeta typeMeta; - private io.fabric8.openshift.api.model.installer.vsphere.v1.MachinePool vSphereMachinePool; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ValidationSchema() { - } - - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, io.fabric8.openshift.api.model.installer.alibabacloud.v1.MachinePool alibabaCloudMachinePool, io.fabric8.openshift.api.model.installer.aws.v1.MachinePool awsMachinePool, io.fabric8.openshift.api.model.installer.azure.v1.MachinePool azureMachinePool, io.fabric8.openshift.api.model.installer.baremetal.v1.MachinePool baremetalMachinePool, KubernetesList baseKubernetesList, io.fabric8.openshift.api.model.installer.gcp.v1.MachinePool gcpMachinePool, io.fabric8.openshift.api.model.installer.ibmcloud.v1.MachinePool iBMCloudMachinePool, InstallConfig installConfig, io.fabric8.openshift.api.model.installer.libvirt.v1.MachinePool libvirtMachinePool, ObjectMeta objectMeta, io.fabric8.openshift.api.model.installer.openstack.v1.MachinePool openStackMachinePool, io.fabric8.openshift.api.model.installer.ovirt.v1.MachinePool ovirtMachinePool, Patch patch, Status status, String time, TypeMeta typeMeta, io.fabric8.openshift.api.model.installer.vsphere.v1.MachinePool vSphereMachinePool) { - super(); - this.aPIGroup = aPIGroup; - this.aPIGroupList = aPIGroupList; - this.alibabaCloudMachinePool = alibabaCloudMachinePool; - this.awsMachinePool = awsMachinePool; - this.azureMachinePool = azureMachinePool; - this.baremetalMachinePool = baremetalMachinePool; - this.baseKubernetesList = baseKubernetesList; - this.gcpMachinePool = gcpMachinePool; - this.iBMCloudMachinePool = iBMCloudMachinePool; - this.installConfig = installConfig; - this.libvirtMachinePool = libvirtMachinePool; - this.objectMeta = objectMeta; - this.openStackMachinePool = openStackMachinePool; - this.ovirtMachinePool = ovirtMachinePool; - this.patch = patch; - this.status = status; - this.time = time; - this.typeMeta = typeMeta; - this.vSphereMachinePool = vSphereMachinePool; - } - - @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("AlibabaCloudMachinePool") - public io.fabric8.openshift.api.model.installer.alibabacloud.v1.MachinePool getAlibabaCloudMachinePool() { - return alibabaCloudMachinePool; - } - - @JsonProperty("AlibabaCloudMachinePool") - public void setAlibabaCloudMachinePool(io.fabric8.openshift.api.model.installer.alibabacloud.v1.MachinePool alibabaCloudMachinePool) { - this.alibabaCloudMachinePool = alibabaCloudMachinePool; - } - - @JsonProperty("AwsMachinePool") - public io.fabric8.openshift.api.model.installer.aws.v1.MachinePool getAwsMachinePool() { - return awsMachinePool; - } - - @JsonProperty("AwsMachinePool") - public void setAwsMachinePool(io.fabric8.openshift.api.model.installer.aws.v1.MachinePool awsMachinePool) { - this.awsMachinePool = awsMachinePool; - } - - @JsonProperty("AzureMachinePool") - public io.fabric8.openshift.api.model.installer.azure.v1.MachinePool getAzureMachinePool() { - return azureMachinePool; - } - - @JsonProperty("AzureMachinePool") - public void setAzureMachinePool(io.fabric8.openshift.api.model.installer.azure.v1.MachinePool azureMachinePool) { - this.azureMachinePool = azureMachinePool; - } - - @JsonProperty("BaremetalMachinePool") - public io.fabric8.openshift.api.model.installer.baremetal.v1.MachinePool getBaremetalMachinePool() { - return baremetalMachinePool; - } - - @JsonProperty("BaremetalMachinePool") - public void setBaremetalMachinePool(io.fabric8.openshift.api.model.installer.baremetal.v1.MachinePool baremetalMachinePool) { - this.baremetalMachinePool = baremetalMachinePool; - } - - @JsonProperty("BaseKubernetesList") - public KubernetesList getBaseKubernetesList() { - return baseKubernetesList; - } - - @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(KubernetesList baseKubernetesList) { - this.baseKubernetesList = baseKubernetesList; - } - - @JsonProperty("GcpMachinePool") - public io.fabric8.openshift.api.model.installer.gcp.v1.MachinePool getGcpMachinePool() { - return gcpMachinePool; - } - - @JsonProperty("GcpMachinePool") - public void setGcpMachinePool(io.fabric8.openshift.api.model.installer.gcp.v1.MachinePool gcpMachinePool) { - this.gcpMachinePool = gcpMachinePool; - } - - @JsonProperty("IBMCloudMachinePool") - public io.fabric8.openshift.api.model.installer.ibmcloud.v1.MachinePool getIBMCloudMachinePool() { - return iBMCloudMachinePool; - } - - @JsonProperty("IBMCloudMachinePool") - public void setIBMCloudMachinePool(io.fabric8.openshift.api.model.installer.ibmcloud.v1.MachinePool iBMCloudMachinePool) { - this.iBMCloudMachinePool = iBMCloudMachinePool; - } - - @JsonProperty("InstallConfig") - public InstallConfig getInstallConfig() { - return installConfig; - } - - @JsonProperty("InstallConfig") - public void setInstallConfig(InstallConfig installConfig) { - this.installConfig = installConfig; - } - - @JsonProperty("LibvirtMachinePool") - public io.fabric8.openshift.api.model.installer.libvirt.v1.MachinePool getLibvirtMachinePool() { - return libvirtMachinePool; - } - - @JsonProperty("LibvirtMachinePool") - public void setLibvirtMachinePool(io.fabric8.openshift.api.model.installer.libvirt.v1.MachinePool libvirtMachinePool) { - this.libvirtMachinePool = libvirtMachinePool; - } - - @JsonProperty("ObjectMeta") - public ObjectMeta getObjectMeta() { - return objectMeta; - } - - @JsonProperty("ObjectMeta") - public void setObjectMeta(ObjectMeta objectMeta) { - this.objectMeta = objectMeta; - } - - @JsonProperty("OpenStackMachinePool") - public io.fabric8.openshift.api.model.installer.openstack.v1.MachinePool getOpenStackMachinePool() { - return openStackMachinePool; - } - - @JsonProperty("OpenStackMachinePool") - public void setOpenStackMachinePool(io.fabric8.openshift.api.model.installer.openstack.v1.MachinePool openStackMachinePool) { - this.openStackMachinePool = openStackMachinePool; - } - - @JsonProperty("OvirtMachinePool") - public io.fabric8.openshift.api.model.installer.ovirt.v1.MachinePool getOvirtMachinePool() { - return ovirtMachinePool; - } - - @JsonProperty("OvirtMachinePool") - public void setOvirtMachinePool(io.fabric8.openshift.api.model.installer.ovirt.v1.MachinePool ovirtMachinePool) { - this.ovirtMachinePool = ovirtMachinePool; - } - - @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("VSphereMachinePool") - public io.fabric8.openshift.api.model.installer.vsphere.v1.MachinePool getVSphereMachinePool() { - return vSphereMachinePool; - } - - @JsonProperty("VSphereMachinePool") - public void setVSphereMachinePool(io.fabric8.openshift.api.model.installer.vsphere.v1.MachinePool vSphereMachinePool) { - this.vSphereMachinePool = vSphereMachinePool; - } - - @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-installer/src/generated/java/io/fabric8/openshift/api/model/installer/aws/v1/MachinePool.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/aws/v1/MachinePool.java index beb7a606bd1..54e3f62db3b 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/aws/v1/MachinePool.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/aws/v1/MachinePool.java @@ -33,7 +33,9 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ + "additionalSecurityGroupIDs", "amiID", + "iamProfile", "iamRole", "metadataService", "rootVolume", @@ -61,8 +63,13 @@ public class MachinePool implements Editable , KubernetesResource { + @JsonProperty("additionalSecurityGroupIDs") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List additionalSecurityGroupIDs = new ArrayList<>(); @JsonProperty("amiID") private String amiID; + @JsonProperty("iamProfile") + private String iamProfile; @JsonProperty("iamRole") private String iamRole; @JsonProperty("metadataService") @@ -84,9 +91,11 @@ public class MachinePool implements Editable , KubernetesRes public MachinePool() { } - public MachinePool(String amiID, String iamRole, EC2Metadata metadataService, EC2RootVolume rootVolume, String type, List zones) { + public MachinePool(List additionalSecurityGroupIDs, String amiID, String iamProfile, String iamRole, EC2Metadata metadataService, EC2RootVolume rootVolume, String type, List zones) { super(); + this.additionalSecurityGroupIDs = additionalSecurityGroupIDs; this.amiID = amiID; + this.iamProfile = iamProfile; this.iamRole = iamRole; this.metadataService = metadataService; this.rootVolume = rootVolume; @@ -94,6 +103,17 @@ public MachinePool(String amiID, String iamRole, EC2Metadata metadataService, EC this.zones = zones; } + @JsonProperty("additionalSecurityGroupIDs") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getAdditionalSecurityGroupIDs() { + return additionalSecurityGroupIDs; + } + + @JsonProperty("additionalSecurityGroupIDs") + public void setAdditionalSecurityGroupIDs(List additionalSecurityGroupIDs) { + this.additionalSecurityGroupIDs = additionalSecurityGroupIDs; + } + @JsonProperty("amiID") public String getAmiID() { return amiID; @@ -104,6 +124,16 @@ public void setAmiID(String amiID) { this.amiID = amiID; } + @JsonProperty("iamProfile") + public String getIamProfile() { + return iamProfile; + } + + @JsonProperty("iamProfile") + public void setIamProfile(String iamProfile) { + this.iamProfile = iamProfile; + } + @JsonProperty("iamRole") public String getIamRole() { return iamRole; diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/alibabacloud/v1/Platform.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/aws/v1/Metadata.java similarity index 56% rename from kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/alibabacloud/v1/Platform.java rename to kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/aws/v1/Metadata.java index 8501955e915..a0dc9e4e0b1 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/alibabacloud/v1/Platform.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/aws/v1/Metadata.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.installer.alibabacloud.v1; +package io.fabric8.openshift.api.model.installer.aws.v1; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -33,13 +33,11 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "defaultMachinePlatform", - "privateZoneID", + "clusterDomain", + "hostedZoneRole", + "identifier", "region", - "resourceGroupID", - "tags", - "vpcID", - "vswitchIDs" + "serviceEndpoints" }) @ToString @EqualsAndHashCode @@ -59,25 +57,21 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class Platform implements Editable , KubernetesResource +public class Metadata implements Editable , KubernetesResource { - @JsonProperty("defaultMachinePlatform") - private MachinePool defaultMachinePlatform; - @JsonProperty("privateZoneID") - private String privateZoneID; + @JsonProperty("clusterDomain") + private String clusterDomain; + @JsonProperty("hostedZoneRole") + private String hostedZoneRole; + @JsonProperty("identifier") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List> identifier = new ArrayList<>(); @JsonProperty("region") private String region; - @JsonProperty("resourceGroupID") - private String resourceGroupID; - @JsonProperty("tags") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Map tags = new LinkedHashMap<>(); - @JsonProperty("vpcID") - private String vpcID; - @JsonProperty("vswitchIDs") + @JsonProperty("serviceEndpoints") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List vswitchIDs = new ArrayList<>(); + private List serviceEndpoints = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -85,38 +79,47 @@ public class Platform implements Editable , KubernetesResource * No args constructor for use in serialization * */ - public Platform() { + public Metadata() { } - public Platform(MachinePool defaultMachinePlatform, String privateZoneID, String region, String resourceGroupID, Map tags, String vpcID, List vswitchIDs) { + public Metadata(String clusterDomain, String hostedZoneRole, List> identifier, String region, List serviceEndpoints) { super(); - this.defaultMachinePlatform = defaultMachinePlatform; - this.privateZoneID = privateZoneID; + this.clusterDomain = clusterDomain; + this.hostedZoneRole = hostedZoneRole; + this.identifier = identifier; this.region = region; - this.resourceGroupID = resourceGroupID; - this.tags = tags; - this.vpcID = vpcID; - this.vswitchIDs = vswitchIDs; + this.serviceEndpoints = serviceEndpoints; + } + + @JsonProperty("clusterDomain") + public String getClusterDomain() { + return clusterDomain; + } + + @JsonProperty("clusterDomain") + public void setClusterDomain(String clusterDomain) { + this.clusterDomain = clusterDomain; } - @JsonProperty("defaultMachinePlatform") - public MachinePool getDefaultMachinePlatform() { - return defaultMachinePlatform; + @JsonProperty("hostedZoneRole") + public String getHostedZoneRole() { + return hostedZoneRole; } - @JsonProperty("defaultMachinePlatform") - public void setDefaultMachinePlatform(MachinePool defaultMachinePlatform) { - this.defaultMachinePlatform = defaultMachinePlatform; + @JsonProperty("hostedZoneRole") + public void setHostedZoneRole(String hostedZoneRole) { + this.hostedZoneRole = hostedZoneRole; } - @JsonProperty("privateZoneID") - public String getPrivateZoneID() { - return privateZoneID; + @JsonProperty("identifier") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List> getIdentifier() { + return identifier; } - @JsonProperty("privateZoneID") - public void setPrivateZoneID(String privateZoneID) { - this.privateZoneID = privateZoneID; + @JsonProperty("identifier") + public void setIdentifier(List> identifier) { + this.identifier = identifier; } @JsonProperty("region") @@ -129,55 +132,24 @@ public void setRegion(String region) { this.region = region; } - @JsonProperty("resourceGroupID") - public String getResourceGroupID() { - return resourceGroupID; - } - - @JsonProperty("resourceGroupID") - public void setResourceGroupID(String resourceGroupID) { - this.resourceGroupID = resourceGroupID; - } - - @JsonProperty("tags") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public Map getTags() { - return tags; - } - - @JsonProperty("tags") - public void setTags(Map tags) { - this.tags = tags; - } - - @JsonProperty("vpcID") - public String getVpcID() { - return vpcID; - } - - @JsonProperty("vpcID") - public void setVpcID(String vpcID) { - this.vpcID = vpcID; - } - - @JsonProperty("vswitchIDs") + @JsonProperty("serviceEndpoints") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getVswitchIDs() { - return vswitchIDs; + public List getServiceEndpoints() { + return serviceEndpoints; } - @JsonProperty("vswitchIDs") - public void setVswitchIDs(List vswitchIDs) { - this.vswitchIDs = vswitchIDs; + @JsonProperty("serviceEndpoints") + public void setServiceEndpoints(List serviceEndpoints) { + this.serviceEndpoints = serviceEndpoints; } @JsonIgnore - public PlatformBuilder edit() { - return new PlatformBuilder(this); + public MetadataBuilder edit() { + return new MetadataBuilder(this); } @JsonIgnore - public PlatformBuilder toBuilder() { + public MetadataBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/aws/v1/Platform.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/aws/v1/Platform.java index 29d1c7821ba..91dd178c3ed 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/aws/v1/Platform.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/aws/v1/Platform.java @@ -34,11 +34,15 @@ @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ "amiID", + "bestEffortDeleteIgnition", "defaultMachinePlatform", "experimentalPropagateUserTags", "hostedZone", + "hostedZoneRole", "lbType", + "preserveBootstrapIgnition", "propagateUserTags", + "publicIpv4Pool", "region", "serviceEndpoints", "subnets", @@ -67,16 +71,24 @@ public class Platform implements Editable , KubernetesResource @JsonProperty("amiID") private String amiID; + @JsonProperty("bestEffortDeleteIgnition") + private Boolean bestEffortDeleteIgnition; @JsonProperty("defaultMachinePlatform") private MachinePool defaultMachinePlatform; @JsonProperty("experimentalPropagateUserTags") private Boolean experimentalPropagateUserTags; @JsonProperty("hostedZone") private String hostedZone; + @JsonProperty("hostedZoneRole") + private String hostedZoneRole; @JsonProperty("lbType") private String lbType; + @JsonProperty("preserveBootstrapIgnition") + private Boolean preserveBootstrapIgnition; @JsonProperty("propagateUserTags") private Boolean propagateUserTags; + @JsonProperty("publicIpv4Pool") + private String publicIpv4Pool; @JsonProperty("region") private String region; @JsonProperty("serviceEndpoints") @@ -98,14 +110,18 @@ public class Platform implements Editable , KubernetesResource public Platform() { } - public Platform(String amiID, MachinePool defaultMachinePlatform, Boolean experimentalPropagateUserTags, String hostedZone, String lbType, Boolean propagateUserTags, String region, List serviceEndpoints, List subnets, Map userTags) { + public Platform(String amiID, Boolean bestEffortDeleteIgnition, MachinePool defaultMachinePlatform, Boolean experimentalPropagateUserTags, String hostedZone, String hostedZoneRole, String lbType, Boolean preserveBootstrapIgnition, Boolean propagateUserTags, String publicIpv4Pool, String region, List serviceEndpoints, List subnets, Map userTags) { super(); this.amiID = amiID; + this.bestEffortDeleteIgnition = bestEffortDeleteIgnition; this.defaultMachinePlatform = defaultMachinePlatform; this.experimentalPropagateUserTags = experimentalPropagateUserTags; this.hostedZone = hostedZone; + this.hostedZoneRole = hostedZoneRole; this.lbType = lbType; + this.preserveBootstrapIgnition = preserveBootstrapIgnition; this.propagateUserTags = propagateUserTags; + this.publicIpv4Pool = publicIpv4Pool; this.region = region; this.serviceEndpoints = serviceEndpoints; this.subnets = subnets; @@ -122,6 +138,16 @@ public void setAmiID(String amiID) { this.amiID = amiID; } + @JsonProperty("bestEffortDeleteIgnition") + public Boolean getBestEffortDeleteIgnition() { + return bestEffortDeleteIgnition; + } + + @JsonProperty("bestEffortDeleteIgnition") + public void setBestEffortDeleteIgnition(Boolean bestEffortDeleteIgnition) { + this.bestEffortDeleteIgnition = bestEffortDeleteIgnition; + } + @JsonProperty("defaultMachinePlatform") public MachinePool getDefaultMachinePlatform() { return defaultMachinePlatform; @@ -152,6 +178,16 @@ public void setHostedZone(String hostedZone) { this.hostedZone = hostedZone; } + @JsonProperty("hostedZoneRole") + public String getHostedZoneRole() { + return hostedZoneRole; + } + + @JsonProperty("hostedZoneRole") + public void setHostedZoneRole(String hostedZoneRole) { + this.hostedZoneRole = hostedZoneRole; + } + @JsonProperty("lbType") public String getLbType() { return lbType; @@ -162,6 +198,16 @@ public void setLbType(String lbType) { this.lbType = lbType; } + @JsonProperty("preserveBootstrapIgnition") + public Boolean getPreserveBootstrapIgnition() { + return preserveBootstrapIgnition; + } + + @JsonProperty("preserveBootstrapIgnition") + public void setPreserveBootstrapIgnition(Boolean preserveBootstrapIgnition) { + this.preserveBootstrapIgnition = preserveBootstrapIgnition; + } + @JsonProperty("propagateUserTags") public Boolean getPropagateUserTags() { return propagateUserTags; @@ -172,6 +218,16 @@ public void setPropagateUserTags(Boolean propagateUserTags) { this.propagateUserTags = propagateUserTags; } + @JsonProperty("publicIpv4Pool") + public String getPublicIpv4Pool() { + return publicIpv4Pool; + } + + @JsonProperty("publicIpv4Pool") + public void setPublicIpv4Pool(String publicIpv4Pool) { + this.publicIpv4Pool = publicIpv4Pool; + } + @JsonProperty("region") public String getRegion() { return region; diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/ConfidentialVM.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/ConfidentialVM.java new file mode 100644 index 00000000000..f29996751e5 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/ConfidentialVM.java @@ -0,0 +1,108 @@ + +package io.fabric8.openshift.api.model.installer.azure.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({ + "uefiSettings" +}) +@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 ConfidentialVM implements Editable , KubernetesResource +{ + + @JsonProperty("uefiSettings") + private UEFISettings uefiSettings; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ConfidentialVM() { + } + + public ConfidentialVM(UEFISettings uefiSettings) { + super(); + this.uefiSettings = uefiSettings; + } + + @JsonProperty("uefiSettings") + public UEFISettings getUefiSettings() { + return uefiSettings; + } + + @JsonProperty("uefiSettings") + public void setUefiSettings(UEFISettings uefiSettings) { + this.uefiSettings = uefiSettings; + } + + @JsonIgnore + public ConfidentialVMBuilder edit() { + return new ConfidentialVMBuilder(this); + } + + @JsonIgnore + public ConfidentialVMBuilder 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-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/CustomerManagedKey.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/CustomerManagedKey.java new file mode 100644 index 00000000000..3676c8c19e0 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/CustomerManagedKey.java @@ -0,0 +1,122 @@ + +package io.fabric8.openshift.api.model.installer.azure.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({ + "keyVault", + "userAssignedIdentityKey" +}) +@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 CustomerManagedKey implements Editable , KubernetesResource +{ + + @JsonProperty("keyVault") + private KeyVault keyVault; + @JsonProperty("userAssignedIdentityKey") + private String userAssignedIdentityKey; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public CustomerManagedKey() { + } + + public CustomerManagedKey(KeyVault keyVault, String userAssignedIdentityKey) { + super(); + this.keyVault = keyVault; + this.userAssignedIdentityKey = userAssignedIdentityKey; + } + + @JsonProperty("keyVault") + public KeyVault getKeyVault() { + return keyVault; + } + + @JsonProperty("keyVault") + public void setKeyVault(KeyVault keyVault) { + this.keyVault = keyVault; + } + + @JsonProperty("userAssignedIdentityKey") + public String getUserAssignedIdentityKey() { + return userAssignedIdentityKey; + } + + @JsonProperty("userAssignedIdentityKey") + public void setUserAssignedIdentityKey(String userAssignedIdentityKey) { + this.userAssignedIdentityKey = userAssignedIdentityKey; + } + + @JsonIgnore + public CustomerManagedKeyBuilder edit() { + return new CustomerManagedKeyBuilder(this); + } + + @JsonIgnore + public CustomerManagedKeyBuilder 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-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/KeyVault.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/KeyVault.java new file mode 100644 index 00000000000..5242634537b --- /dev/null +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/KeyVault.java @@ -0,0 +1,136 @@ + +package io.fabric8.openshift.api.model.installer.azure.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({ + "keyName", + "name", + "resourceGroup" +}) +@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 KeyVault implements Editable , KubernetesResource +{ + + @JsonProperty("keyName") + private String keyName; + @JsonProperty("name") + private String name; + @JsonProperty("resourceGroup") + private String resourceGroup; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public KeyVault() { + } + + public KeyVault(String keyName, String name, String resourceGroup) { + super(); + this.keyName = keyName; + this.name = name; + this.resourceGroup = resourceGroup; + } + + @JsonProperty("keyName") + public String getKeyName() { + return keyName; + } + + @JsonProperty("keyName") + public void setKeyName(String keyName) { + this.keyName = keyName; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonProperty("resourceGroup") + public String getResourceGroup() { + return resourceGroup; + } + + @JsonProperty("resourceGroup") + public void setResourceGroup(String resourceGroup) { + this.resourceGroup = resourceGroup; + } + + @JsonIgnore + public KeyVaultBuilder edit() { + return new KeyVaultBuilder(this); + } + + @JsonIgnore + public KeyVaultBuilder 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-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/MachinePool.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/MachinePool.java index 6270f098876..81e258829b3 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/MachinePool.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/MachinePool.java @@ -36,6 +36,7 @@ "encryptionAtHost", "osDisk", "osImage", + "settings", "type", "ultraSSDCapability", "vmNetworkingType", @@ -68,6 +69,8 @@ public class MachinePool implements Editable , KubernetesRes private OSDisk osDisk; @JsonProperty("osImage") private OSImage osImage; + @JsonProperty("settings") + private SecuritySettings settings; @JsonProperty("type") private String type; @JsonProperty("ultraSSDCapability") @@ -87,11 +90,12 @@ public class MachinePool implements Editable , KubernetesRes public MachinePool() { } - public MachinePool(Boolean encryptionAtHost, OSDisk osDisk, OSImage osImage, String type, String ultraSSDCapability, String vmNetworkingType, List zones) { + public MachinePool(Boolean encryptionAtHost, OSDisk osDisk, OSImage osImage, SecuritySettings settings, String type, String ultraSSDCapability, String vmNetworkingType, List zones) { super(); this.encryptionAtHost = encryptionAtHost; this.osDisk = osDisk; this.osImage = osImage; + this.settings = settings; this.type = type; this.ultraSSDCapability = ultraSSDCapability; this.vmNetworkingType = vmNetworkingType; @@ -128,6 +132,16 @@ public void setOsImage(OSImage osImage) { this.osImage = osImage; } + @JsonProperty("settings") + public SecuritySettings getSettings() { + return settings; + } + + @JsonProperty("settings") + public void setSettings(SecuritySettings settings) { + this.settings = settings; + } + @JsonProperty("type") public String getType() { return type; diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/Metadata.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/Metadata.java new file mode 100644 index 00000000000..b38689ad142 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/Metadata.java @@ -0,0 +1,164 @@ + +package io.fabric8.openshift.api.model.installer.azure.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({ + "armEndpoint", + "baseDomainResourceGroupName", + "cloudName", + "region", + "resourceGroupName" +}) +@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 Metadata implements Editable , KubernetesResource +{ + + @JsonProperty("armEndpoint") + private String armEndpoint; + @JsonProperty("baseDomainResourceGroupName") + private String baseDomainResourceGroupName; + @JsonProperty("cloudName") + private String cloudName; + @JsonProperty("region") + private String region; + @JsonProperty("resourceGroupName") + private String resourceGroupName; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public Metadata() { + } + + public Metadata(String armEndpoint, String baseDomainResourceGroupName, String cloudName, String region, String resourceGroupName) { + super(); + this.armEndpoint = armEndpoint; + this.baseDomainResourceGroupName = baseDomainResourceGroupName; + this.cloudName = cloudName; + this.region = region; + this.resourceGroupName = resourceGroupName; + } + + @JsonProperty("armEndpoint") + public String getArmEndpoint() { + return armEndpoint; + } + + @JsonProperty("armEndpoint") + public void setArmEndpoint(String armEndpoint) { + this.armEndpoint = armEndpoint; + } + + @JsonProperty("baseDomainResourceGroupName") + public String getBaseDomainResourceGroupName() { + return baseDomainResourceGroupName; + } + + @JsonProperty("baseDomainResourceGroupName") + public void setBaseDomainResourceGroupName(String baseDomainResourceGroupName) { + this.baseDomainResourceGroupName = baseDomainResourceGroupName; + } + + @JsonProperty("cloudName") + public String getCloudName() { + return cloudName; + } + + @JsonProperty("cloudName") + public void setCloudName(String cloudName) { + this.cloudName = cloudName; + } + + @JsonProperty("region") + public String getRegion() { + return region; + } + + @JsonProperty("region") + public void setRegion(String region) { + this.region = region; + } + + @JsonProperty("resourceGroupName") + public String getResourceGroupName() { + return resourceGroupName; + } + + @JsonProperty("resourceGroupName") + public void setResourceGroupName(String resourceGroupName) { + this.resourceGroupName = resourceGroupName; + } + + @JsonIgnore + public MetadataBuilder edit() { + return new MetadataBuilder(this); + } + + @JsonIgnore + public MetadataBuilder 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-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/OSDisk.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/OSDisk.java index 128230ebee5..2bcbfa36529 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/OSDisk.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/OSDisk.java @@ -33,7 +33,8 @@ @JsonPropertyOrder({ "diskEncryptionSet", "diskSizeGB", - "diskType" + "diskType", + "securityProfile" }) @ToString @EqualsAndHashCode @@ -62,6 +63,8 @@ public class OSDisk implements Editable , KubernetesResource private Integer diskSizeGB; @JsonProperty("diskType") private String diskType; + @JsonProperty("securityProfile") + private VMDiskSecurityProfile securityProfile; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -72,11 +75,12 @@ public class OSDisk implements Editable , KubernetesResource public OSDisk() { } - public OSDisk(DiskEncryptionSet diskEncryptionSet, Integer diskSizeGB, String diskType) { + public OSDisk(DiskEncryptionSet diskEncryptionSet, Integer diskSizeGB, String diskType, VMDiskSecurityProfile securityProfile) { super(); this.diskEncryptionSet = diskEncryptionSet; this.diskSizeGB = diskSizeGB; this.diskType = diskType; + this.securityProfile = securityProfile; } @JsonProperty("diskEncryptionSet") @@ -109,6 +113,16 @@ public void setDiskType(String diskType) { this.diskType = diskType; } + @JsonProperty("securityProfile") + public VMDiskSecurityProfile getSecurityProfile() { + return securityProfile; + } + + @JsonProperty("securityProfile") + public void setSecurityProfile(VMDiskSecurityProfile securityProfile) { + this.securityProfile = securityProfile; + } + @JsonIgnore public OSDiskBuilder edit() { return new OSDiskBuilder(this); diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/OSImage.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/OSImage.java index 63bf8779572..4b8cfbc4462 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/OSImage.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/OSImage.java @@ -32,6 +32,7 @@ @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ "offer", + "plan", "publisher", "sku", "version" @@ -59,6 +60,8 @@ public class OSImage implements Editable , KubernetesResource @JsonProperty("offer") private String offer; + @JsonProperty("plan") + private String plan; @JsonProperty("publisher") private String publisher; @JsonProperty("sku") @@ -75,9 +78,10 @@ public class OSImage implements Editable , KubernetesResource public OSImage() { } - public OSImage(String offer, String publisher, String sku, String version) { + public OSImage(String offer, String plan, String publisher, String sku, String version) { super(); this.offer = offer; + this.plan = plan; this.publisher = publisher; this.sku = sku; this.version = version; @@ -93,6 +97,16 @@ public void setOffer(String offer) { this.offer = offer; } + @JsonProperty("plan") + public String getPlan() { + return plan; + } + + @JsonProperty("plan") + public void setPlan(String plan) { + this.plan = plan; + } + @JsonProperty("publisher") public String getPublisher() { return publisher; diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/Platform.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/Platform.java index bfbe0bcecf4..b5f520dea26 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/Platform.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/Platform.java @@ -37,6 +37,7 @@ "clusterOSImage", "computeSubnet", "controlPlaneSubnet", + "customerManagedKey", "defaultMachinePlatform", "networkResourceGroupName", "outboundType", @@ -78,6 +79,8 @@ public class Platform implements Editable , KubernetesResource private String computeSubnet; @JsonProperty("controlPlaneSubnet") private String controlPlaneSubnet; + @JsonProperty("customerManagedKey") + private CustomerManagedKey customerManagedKey; @JsonProperty("defaultMachinePlatform") private MachinePool defaultMachinePlatform; @JsonProperty("networkResourceGroupName") @@ -103,7 +106,7 @@ public class Platform implements Editable , KubernetesResource public Platform() { } - public Platform(String armEndpoint, String baseDomainResourceGroupName, String cloudName, String clusterOSImage, String computeSubnet, String controlPlaneSubnet, MachinePool defaultMachinePlatform, String networkResourceGroupName, String outboundType, String region, String resourceGroupName, Map userTags, String virtualNetwork) { + public Platform(String armEndpoint, String baseDomainResourceGroupName, String cloudName, String clusterOSImage, String computeSubnet, String controlPlaneSubnet, CustomerManagedKey customerManagedKey, MachinePool defaultMachinePlatform, String networkResourceGroupName, String outboundType, String region, String resourceGroupName, Map userTags, String virtualNetwork) { super(); this.armEndpoint = armEndpoint; this.baseDomainResourceGroupName = baseDomainResourceGroupName; @@ -111,6 +114,7 @@ public Platform(String armEndpoint, String baseDomainResourceGroupName, String c this.clusterOSImage = clusterOSImage; this.computeSubnet = computeSubnet; this.controlPlaneSubnet = controlPlaneSubnet; + this.customerManagedKey = customerManagedKey; this.defaultMachinePlatform = defaultMachinePlatform; this.networkResourceGroupName = networkResourceGroupName; this.outboundType = outboundType; @@ -180,6 +184,16 @@ public void setControlPlaneSubnet(String controlPlaneSubnet) { this.controlPlaneSubnet = controlPlaneSubnet; } + @JsonProperty("customerManagedKey") + public CustomerManagedKey getCustomerManagedKey() { + return customerManagedKey; + } + + @JsonProperty("customerManagedKey") + public void setCustomerManagedKey(CustomerManagedKey customerManagedKey) { + this.customerManagedKey = customerManagedKey; + } + @JsonProperty("defaultMachinePlatform") public MachinePool getDefaultMachinePlatform() { return defaultMachinePlatform; diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/SecuritySettings.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/SecuritySettings.java new file mode 100644 index 00000000000..c4c18ccc0e8 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/SecuritySettings.java @@ -0,0 +1,136 @@ + +package io.fabric8.openshift.api.model.installer.azure.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({ + "confidentialVM", + "securityType", + "trustedLaunch" +}) +@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 SecuritySettings implements Editable , KubernetesResource +{ + + @JsonProperty("confidentialVM") + private ConfidentialVM confidentialVM; + @JsonProperty("securityType") + private String securityType; + @JsonProperty("trustedLaunch") + private TrustedLaunch trustedLaunch; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public SecuritySettings() { + } + + public SecuritySettings(ConfidentialVM confidentialVM, String securityType, TrustedLaunch trustedLaunch) { + super(); + this.confidentialVM = confidentialVM; + this.securityType = securityType; + this.trustedLaunch = trustedLaunch; + } + + @JsonProperty("confidentialVM") + public ConfidentialVM getConfidentialVM() { + return confidentialVM; + } + + @JsonProperty("confidentialVM") + public void setConfidentialVM(ConfidentialVM confidentialVM) { + this.confidentialVM = confidentialVM; + } + + @JsonProperty("securityType") + public String getSecurityType() { + return securityType; + } + + @JsonProperty("securityType") + public void setSecurityType(String securityType) { + this.securityType = securityType; + } + + @JsonProperty("trustedLaunch") + public TrustedLaunch getTrustedLaunch() { + return trustedLaunch; + } + + @JsonProperty("trustedLaunch") + public void setTrustedLaunch(TrustedLaunch trustedLaunch) { + this.trustedLaunch = trustedLaunch; + } + + @JsonIgnore + public SecuritySettingsBuilder edit() { + return new SecuritySettingsBuilder(this); + } + + @JsonIgnore + public SecuritySettingsBuilder 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-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/TrustedLaunch.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/TrustedLaunch.java new file mode 100644 index 00000000000..a50597c96f0 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/TrustedLaunch.java @@ -0,0 +1,108 @@ + +package io.fabric8.openshift.api.model.installer.azure.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({ + "uefiSettings" +}) +@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 TrustedLaunch implements Editable , KubernetesResource +{ + + @JsonProperty("uefiSettings") + private UEFISettings uefiSettings; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public TrustedLaunch() { + } + + public TrustedLaunch(UEFISettings uefiSettings) { + super(); + this.uefiSettings = uefiSettings; + } + + @JsonProperty("uefiSettings") + public UEFISettings getUefiSettings() { + return uefiSettings; + } + + @JsonProperty("uefiSettings") + public void setUefiSettings(UEFISettings uefiSettings) { + this.uefiSettings = uefiSettings; + } + + @JsonIgnore + public TrustedLaunchBuilder edit() { + return new TrustedLaunchBuilder(this); + } + + @JsonIgnore + public TrustedLaunchBuilder 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-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/UEFISettings.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/UEFISettings.java new file mode 100644 index 00000000000..5e141379357 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/UEFISettings.java @@ -0,0 +1,122 @@ + +package io.fabric8.openshift.api.model.installer.azure.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({ + "secureBoot", + "virtualizedTrustedPlatformModule" +}) +@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 UEFISettings implements Editable , KubernetesResource +{ + + @JsonProperty("secureBoot") + private String secureBoot; + @JsonProperty("virtualizedTrustedPlatformModule") + private String virtualizedTrustedPlatformModule; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public UEFISettings() { + } + + public UEFISettings(String secureBoot, String virtualizedTrustedPlatformModule) { + super(); + this.secureBoot = secureBoot; + this.virtualizedTrustedPlatformModule = virtualizedTrustedPlatformModule; + } + + @JsonProperty("secureBoot") + public String getSecureBoot() { + return secureBoot; + } + + @JsonProperty("secureBoot") + public void setSecureBoot(String secureBoot) { + this.secureBoot = secureBoot; + } + + @JsonProperty("virtualizedTrustedPlatformModule") + public String getVirtualizedTrustedPlatformModule() { + return virtualizedTrustedPlatformModule; + } + + @JsonProperty("virtualizedTrustedPlatformModule") + public void setVirtualizedTrustedPlatformModule(String virtualizedTrustedPlatformModule) { + this.virtualizedTrustedPlatformModule = virtualizedTrustedPlatformModule; + } + + @JsonIgnore + public UEFISettingsBuilder edit() { + return new UEFISettingsBuilder(this); + } + + @JsonIgnore + public UEFISettingsBuilder 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-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/VMDiskSecurityProfile.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/VMDiskSecurityProfile.java new file mode 100644 index 00000000000..61ea67acb76 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/VMDiskSecurityProfile.java @@ -0,0 +1,122 @@ + +package io.fabric8.openshift.api.model.installer.azure.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({ + "diskEncryptionSet", + "securityEncryptionType" +}) +@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 VMDiskSecurityProfile implements Editable , KubernetesResource +{ + + @JsonProperty("diskEncryptionSet") + private DiskEncryptionSet diskEncryptionSet; + @JsonProperty("securityEncryptionType") + private String securityEncryptionType; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public VMDiskSecurityProfile() { + } + + public VMDiskSecurityProfile(DiskEncryptionSet diskEncryptionSet, String securityEncryptionType) { + super(); + this.diskEncryptionSet = diskEncryptionSet; + this.securityEncryptionType = securityEncryptionType; + } + + @JsonProperty("diskEncryptionSet") + public DiskEncryptionSet getDiskEncryptionSet() { + return diskEncryptionSet; + } + + @JsonProperty("diskEncryptionSet") + public void setDiskEncryptionSet(DiskEncryptionSet diskEncryptionSet) { + this.diskEncryptionSet = diskEncryptionSet; + } + + @JsonProperty("securityEncryptionType") + public String getSecurityEncryptionType() { + return securityEncryptionType; + } + + @JsonProperty("securityEncryptionType") + public void setSecurityEncryptionType(String securityEncryptionType) { + this.securityEncryptionType = securityEncryptionType; + } + + @JsonIgnore + public VMDiskSecurityProfileBuilder edit() { + return new VMDiskSecurityProfileBuilder(this); + } + + @JsonIgnore + public VMDiskSecurityProfileBuilder 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-installer/src/generated/java/io/fabric8/openshift/api/model/installer/baremetal/v1/Metadata.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/baremetal/v1/Metadata.java new file mode 100644 index 00000000000..fb9f9d1d127 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/baremetal/v1/Metadata.java @@ -0,0 +1,136 @@ + +package io.fabric8.openshift.api.model.installer.baremetal.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({ + "bootstrapProvisioningIP", + "libvirtURI", + "provisioningHostIP" +}) +@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 Metadata implements Editable , KubernetesResource +{ + + @JsonProperty("bootstrapProvisioningIP") + private String bootstrapProvisioningIP; + @JsonProperty("libvirtURI") + private String libvirtURI; + @JsonProperty("provisioningHostIP") + private String provisioningHostIP; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public Metadata() { + } + + public Metadata(String bootstrapProvisioningIP, String libvirtURI, String provisioningHostIP) { + super(); + this.bootstrapProvisioningIP = bootstrapProvisioningIP; + this.libvirtURI = libvirtURI; + this.provisioningHostIP = provisioningHostIP; + } + + @JsonProperty("bootstrapProvisioningIP") + public String getBootstrapProvisioningIP() { + return bootstrapProvisioningIP; + } + + @JsonProperty("bootstrapProvisioningIP") + public void setBootstrapProvisioningIP(String bootstrapProvisioningIP) { + this.bootstrapProvisioningIP = bootstrapProvisioningIP; + } + + @JsonProperty("libvirtURI") + public String getLibvirtURI() { + return libvirtURI; + } + + @JsonProperty("libvirtURI") + public void setLibvirtURI(String libvirtURI) { + this.libvirtURI = libvirtURI; + } + + @JsonProperty("provisioningHostIP") + public String getProvisioningHostIP() { + return provisioningHostIP; + } + + @JsonProperty("provisioningHostIP") + public void setProvisioningHostIP(String provisioningHostIP) { + this.provisioningHostIP = provisioningHostIP; + } + + @JsonIgnore + public MetadataBuilder edit() { + return new MetadataBuilder(this); + } + + @JsonIgnore + public MetadataBuilder 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-installer/src/generated/java/io/fabric8/openshift/api/model/installer/baremetal/v1/Platform.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/baremetal/v1/Platform.java index 20afd19d0fc..28a83eee9f0 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/baremetal/v1/Platform.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/baremetal/v1/Platform.java @@ -1,6 +1,7 @@ package io.fabric8.openshift.api.model.installer.baremetal.v1; +import java.lang.String; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; @@ -36,6 +37,7 @@ @JsonPropertyOrder({ "apiVIP", "apiVIPs", + "bootstrapExternalStaticDNS", "bootstrapExternalStaticGateway", "bootstrapExternalStaticIP", "bootstrapOSImage", @@ -85,6 +87,8 @@ public class Platform implements Editable , KubernetesResource @JsonProperty("apiVIPs") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List apiVIPs = new ArrayList<>(); + @JsonProperty("bootstrapExternalStaticDNS") + private String bootstrapExternalStaticDNS; @JsonProperty("bootstrapExternalStaticGateway") private String bootstrapExternalStaticGateway; @JsonProperty("bootstrapExternalStaticIP") @@ -141,10 +145,11 @@ public class Platform implements Editable , KubernetesResource public Platform() { } - public Platform(String apiVIP, List apiVIPs, String bootstrapExternalStaticGateway, String bootstrapExternalStaticIP, String bootstrapOSImage, String bootstrapProvisioningIP, String clusterOSImage, String clusterProvisioningIP, MachinePool defaultMachinePlatform, String externalBridge, String externalMACAddress, List hosts, String ingressVIP, List ingressVIPs, String libvirtURI, BareMetalPlatformLoadBalancer loadBalancer, String provisioningBridge, Boolean provisioningDHCPExternal, String provisioningDHCPRange, String provisioningHostIP, String provisioningMACAddress, String provisioningNetwork, String provisioningNetworkCIDR, String provisioningNetworkInterface) { + public Platform(String apiVIP, List apiVIPs, String bootstrapExternalStaticDNS, String bootstrapExternalStaticGateway, String bootstrapExternalStaticIP, String bootstrapOSImage, String bootstrapProvisioningIP, String clusterOSImage, String clusterProvisioningIP, MachinePool defaultMachinePlatform, String externalBridge, String externalMACAddress, List hosts, String ingressVIP, List ingressVIPs, String libvirtURI, BareMetalPlatformLoadBalancer loadBalancer, String provisioningBridge, Boolean provisioningDHCPExternal, String provisioningDHCPRange, String provisioningHostIP, String provisioningMACAddress, String provisioningNetwork, String provisioningNetworkCIDR, String provisioningNetworkInterface) { super(); this.apiVIP = apiVIP; this.apiVIPs = apiVIPs; + this.bootstrapExternalStaticDNS = bootstrapExternalStaticDNS; this.bootstrapExternalStaticGateway = bootstrapExternalStaticGateway; this.bootstrapExternalStaticIP = bootstrapExternalStaticIP; this.bootstrapOSImage = bootstrapOSImage; @@ -190,6 +195,16 @@ public void setApiVIPs(List apiVIPs) { this.apiVIPs = apiVIPs; } + @JsonProperty("bootstrapExternalStaticDNS") + public String getBootstrapExternalStaticDNS() { + return bootstrapExternalStaticDNS; + } + + @JsonProperty("bootstrapExternalStaticDNS") + public void setBootstrapExternalStaticDNS(String bootstrapExternalStaticDNS) { + this.bootstrapExternalStaticDNS = bootstrapExternalStaticDNS; + } + @JsonProperty("bootstrapExternalStaticGateway") public String getBootstrapExternalStaticGateway() { return bootstrapExternalStaticGateway; diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/libvirt/v1/Platform.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/external/v1/Platform.java similarity index 72% rename from kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/libvirt/v1/Platform.java rename to kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/external/v1/Platform.java index b4a1ecb9505..1286cd5d752 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/libvirt/v1/Platform.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/external/v1/Platform.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.installer.libvirt.v1; +package io.fabric8.openshift.api.model.installer.external.v1; import java.util.LinkedHashMap; import java.util.Map; @@ -31,9 +31,8 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "URI", - "defaultMachinePlatform", - "network" + "cloudControllerManager", + "platformName" }) @ToString @EqualsAndHashCode @@ -56,12 +55,10 @@ public class Platform implements Editable , KubernetesResource { - @JsonProperty("URI") - private String uri; - @JsonProperty("defaultMachinePlatform") - private MachinePool defaultMachinePlatform; - @JsonProperty("network") - private Network network; + @JsonProperty("cloudControllerManager") + private String cloudControllerManager; + @JsonProperty("platformName") + private String platformName; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -72,41 +69,30 @@ public class Platform implements Editable , KubernetesResource public Platform() { } - public Platform(String uri, MachinePool defaultMachinePlatform, Network network) { + public Platform(String cloudControllerManager, String platformName) { super(); - this.uri = uri; - this.defaultMachinePlatform = defaultMachinePlatform; - this.network = network; + this.cloudControllerManager = cloudControllerManager; + this.platformName = platformName; } - @JsonProperty("URI") - public String getUri() { - return uri; + @JsonProperty("cloudControllerManager") + public String getCloudControllerManager() { + return cloudControllerManager; } - @JsonProperty("URI") - public void setUri(String uri) { - this.uri = uri; + @JsonProperty("cloudControllerManager") + public void setCloudControllerManager(String cloudControllerManager) { + this.cloudControllerManager = cloudControllerManager; } - @JsonProperty("defaultMachinePlatform") - public MachinePool getDefaultMachinePlatform() { - return defaultMachinePlatform; + @JsonProperty("platformName") + public String getPlatformName() { + return platformName; } - @JsonProperty("defaultMachinePlatform") - public void setDefaultMachinePlatform(MachinePool defaultMachinePlatform) { - this.defaultMachinePlatform = defaultMachinePlatform; - } - - @JsonProperty("network") - public Network getNetwork() { - return network; - } - - @JsonProperty("network") - public void setNetwork(Network network) { - this.network = network; + @JsonProperty("platformName") + public void setPlatformName(String platformName) { + this.platformName = platformName; } @JsonIgnore diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/gcp/v1/MachinePool.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/gcp/v1/MachinePool.java index 2448bfea3a7..aa02dd3afd5 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/gcp/v1/MachinePool.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/gcp/v1/MachinePool.java @@ -36,7 +36,9 @@ "confidentialCompute", "onHostMaintenance", "osDisk", + "osImage", "secureBoot", + "serviceAccount", "tags", "type", "zones" @@ -68,8 +70,12 @@ public class MachinePool implements Editable , KubernetesRes private String onHostMaintenance; @JsonProperty("osDisk") private OSDisk osDisk; + @JsonProperty("osImage") + private OSImage osImage; @JsonProperty("secureBoot") private String secureBoot; + @JsonProperty("serviceAccount") + private String serviceAccount; @JsonProperty("tags") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List tags = new ArrayList<>(); @@ -88,12 +94,14 @@ public class MachinePool implements Editable , KubernetesRes public MachinePool() { } - public MachinePool(String confidentialCompute, String onHostMaintenance, OSDisk osDisk, String secureBoot, List tags, String type, List zones) { + public MachinePool(String confidentialCompute, String onHostMaintenance, OSDisk osDisk, OSImage osImage, String secureBoot, String serviceAccount, List tags, String type, List zones) { super(); this.confidentialCompute = confidentialCompute; this.onHostMaintenance = onHostMaintenance; this.osDisk = osDisk; + this.osImage = osImage; this.secureBoot = secureBoot; + this.serviceAccount = serviceAccount; this.tags = tags; this.type = type; this.zones = zones; @@ -129,6 +137,16 @@ public void setOsDisk(OSDisk osDisk) { this.osDisk = osDisk; } + @JsonProperty("osImage") + public OSImage getOsImage() { + return osImage; + } + + @JsonProperty("osImage") + public void setOsImage(OSImage osImage) { + this.osImage = osImage; + } + @JsonProperty("secureBoot") public String getSecureBoot() { return secureBoot; @@ -139,6 +157,16 @@ public void setSecureBoot(String secureBoot) { this.secureBoot = secureBoot; } + @JsonProperty("serviceAccount") + public String getServiceAccount() { + return serviceAccount; + } + + @JsonProperty("serviceAccount") + public void setServiceAccount(String serviceAccount) { + this.serviceAccount = serviceAccount; + } + @JsonProperty("tags") @JsonInclude(JsonInclude.Include.NON_EMPTY) public List getTags() { diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/gcp/v1/Metadata.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/gcp/v1/Metadata.java new file mode 100644 index 00000000000..ebcd058b3bb --- /dev/null +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/gcp/v1/Metadata.java @@ -0,0 +1,150 @@ + +package io.fabric8.openshift.api.model.installer.gcp.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({ + "networkProjectID", + "privateZoneDomain", + "projectID", + "region" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Generated("jsonschema2pojo") +public class Metadata implements Editable , KubernetesResource +{ + + @JsonProperty("networkProjectID") + private String networkProjectID; + @JsonProperty("privateZoneDomain") + private String privateZoneDomain; + @JsonProperty("projectID") + private String projectID; + @JsonProperty("region") + private String region; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public Metadata() { + } + + public Metadata(String networkProjectID, String privateZoneDomain, String projectID, String region) { + super(); + this.networkProjectID = networkProjectID; + this.privateZoneDomain = privateZoneDomain; + this.projectID = projectID; + this.region = region; + } + + @JsonProperty("networkProjectID") + public String getNetworkProjectID() { + return networkProjectID; + } + + @JsonProperty("networkProjectID") + public void setNetworkProjectID(String networkProjectID) { + this.networkProjectID = networkProjectID; + } + + @JsonProperty("privateZoneDomain") + public String getPrivateZoneDomain() { + return privateZoneDomain; + } + + @JsonProperty("privateZoneDomain") + public void setPrivateZoneDomain(String privateZoneDomain) { + this.privateZoneDomain = privateZoneDomain; + } + + @JsonProperty("projectID") + public String getProjectID() { + return projectID; + } + + @JsonProperty("projectID") + public void setProjectID(String projectID) { + this.projectID = projectID; + } + + @JsonProperty("region") + public String getRegion() { + return region; + } + + @JsonProperty("region") + public void setRegion(String region) { + this.region = region; + } + + @JsonIgnore + public MetadataBuilder edit() { + return new MetadataBuilder(this); + } + + @JsonIgnore + public MetadataBuilder 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-installer/src/generated/java/io/fabric8/openshift/api/model/installer/gcp/v1/Metric.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/gcp/v1/Metric.java new file mode 100644 index 00000000000..1e060ebcacb --- /dev/null +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/gcp/v1/Metric.java @@ -0,0 +1,138 @@ + +package io.fabric8.openshift.api.model.installer.gcp.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({ + "dimensions", + "limit", + "service" +}) +@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 Metric implements Editable , KubernetesResource +{ + + @JsonProperty("dimensions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private Map dimensions = new LinkedHashMap<>(); + @JsonProperty("limit") + private String limit; + @JsonProperty("service") + private String service; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public Metric() { + } + + public Metric(Map dimensions, String limit, String service) { + super(); + this.dimensions = dimensions; + this.limit = limit; + this.service = service; + } + + @JsonProperty("dimensions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public Map getDimensions() { + return dimensions; + } + + @JsonProperty("dimensions") + public void setDimensions(Map dimensions) { + this.dimensions = dimensions; + } + + @JsonProperty("limit") + public String getLimit() { + return limit; + } + + @JsonProperty("limit") + public void setLimit(String limit) { + this.limit = limit; + } + + @JsonProperty("service") + public String getService() { + return service; + } + + @JsonProperty("service") + public void setService(String service) { + this.service = service; + } + + @JsonIgnore + public MetricBuilder edit() { + return new MetricBuilder(this); + } + + @JsonIgnore + public MetricBuilder 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-installer/src/generated/java/io/fabric8/openshift/api/model/installer/gcp/v1/OSImage.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/gcp/v1/OSImage.java new file mode 100644 index 00000000000..c3d84a80b98 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/gcp/v1/OSImage.java @@ -0,0 +1,122 @@ + +package io.fabric8.openshift.api.model.installer.gcp.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", + "project" +}) +@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 OSImage implements Editable , KubernetesResource +{ + + @JsonProperty("name") + private String name; + @JsonProperty("project") + private String project; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public OSImage() { + } + + public OSImage(String name, String project) { + super(); + this.name = name; + this.project = project; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonProperty("project") + public String getProject() { + return project; + } + + @JsonProperty("project") + public void setProject(String project) { + this.project = project; + } + + @JsonIgnore + public OSImageBuilder edit() { + return new OSImageBuilder(this); + } + + @JsonIgnore + public OSImageBuilder 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-installer/src/generated/java/io/fabric8/openshift/api/model/installer/gcp/v1/Platform.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/gcp/v1/Platform.java index d59aadefb69..d8dde88bdd3 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/gcp/v1/Platform.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/gcp/v1/Platform.java @@ -36,11 +36,13 @@ "computeSubnet", "controlPlaneSubnet", "defaultMachinePlatform", - "licenses", "network", "networkProjectID", "projectID", - "region" + "region", + "userLabels", + "userProvisionedDNS", + "userTags" }) @ToString @EqualsAndHashCode @@ -69,9 +71,6 @@ public class Platform implements Editable , KubernetesResource private String controlPlaneSubnet; @JsonProperty("defaultMachinePlatform") private MachinePool defaultMachinePlatform; - @JsonProperty("licenses") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List licenses = new ArrayList<>(); @JsonProperty("network") private String network; @JsonProperty("networkProjectID") @@ -80,6 +79,14 @@ public class Platform implements Editable , KubernetesResource private String projectID; @JsonProperty("region") private String region; + @JsonProperty("userLabels") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List userLabels = new ArrayList<>(); + @JsonProperty("userProvisionedDNS") + private String userProvisionedDNS; + @JsonProperty("userTags") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List userTags = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -90,16 +97,18 @@ public class Platform implements Editable , KubernetesResource public Platform() { } - public Platform(String computeSubnet, String controlPlaneSubnet, MachinePool defaultMachinePlatform, List licenses, String network, String networkProjectID, String projectID, String region) { + public Platform(String computeSubnet, String controlPlaneSubnet, MachinePool defaultMachinePlatform, String network, String networkProjectID, String projectID, String region, List userLabels, String userProvisionedDNS, List userTags) { super(); this.computeSubnet = computeSubnet; this.controlPlaneSubnet = controlPlaneSubnet; this.defaultMachinePlatform = defaultMachinePlatform; - this.licenses = licenses; this.network = network; this.networkProjectID = networkProjectID; this.projectID = projectID; this.region = region; + this.userLabels = userLabels; + this.userProvisionedDNS = userProvisionedDNS; + this.userTags = userTags; } @JsonProperty("computeSubnet") @@ -132,17 +141,6 @@ public void setDefaultMachinePlatform(MachinePool defaultMachinePlatform) { this.defaultMachinePlatform = defaultMachinePlatform; } - @JsonProperty("licenses") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getLicenses() { - return licenses; - } - - @JsonProperty("licenses") - public void setLicenses(List licenses) { - this.licenses = licenses; - } - @JsonProperty("network") public String getNetwork() { return network; @@ -183,6 +181,38 @@ public void setRegion(String region) { this.region = region; } + @JsonProperty("userLabels") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getUserLabels() { + return userLabels; + } + + @JsonProperty("userLabels") + public void setUserLabels(List userLabels) { + this.userLabels = userLabels; + } + + @JsonProperty("userProvisionedDNS") + public String getUserProvisionedDNS() { + return userProvisionedDNS; + } + + @JsonProperty("userProvisionedDNS") + public void setUserProvisionedDNS(String userProvisionedDNS) { + this.userProvisionedDNS = userProvisionedDNS; + } + + @JsonProperty("userTags") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getUserTags() { + return userTags; + } + + @JsonProperty("userTags") + public void setUserTags(List userTags) { + this.userTags = userTags; + } + @JsonIgnore public PlatformBuilder edit() { return new PlatformBuilder(this); diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/gcp/v1/QuotaUsage.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/gcp/v1/QuotaUsage.java new file mode 100644 index 00000000000..c75008a59d5 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/gcp/v1/QuotaUsage.java @@ -0,0 +1,152 @@ + +package io.fabric8.openshift.api.model.installer.gcp.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({ + "amount", + "dimensions", + "limit", + "service" +}) +@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 QuotaUsage implements Editable , KubernetesResource +{ + + @JsonProperty("amount") + private Long amount; + @JsonProperty("dimensions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private Map dimensions = new LinkedHashMap<>(); + @JsonProperty("limit") + private String limit; + @JsonProperty("service") + private String service; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public QuotaUsage() { + } + + public QuotaUsage(Long amount, Map dimensions, String limit, String service) { + super(); + this.amount = amount; + this.dimensions = dimensions; + this.limit = limit; + this.service = service; + } + + @JsonProperty("amount") + public Long getAmount() { + return amount; + } + + @JsonProperty("amount") + public void setAmount(Long amount) { + this.amount = amount; + } + + @JsonProperty("dimensions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public Map getDimensions() { + return dimensions; + } + + @JsonProperty("dimensions") + public void setDimensions(Map dimensions) { + this.dimensions = dimensions; + } + + @JsonProperty("limit") + public String getLimit() { + return limit; + } + + @JsonProperty("limit") + public void setLimit(String limit) { + this.limit = limit; + } + + @JsonProperty("service") + public String getService() { + return service; + } + + @JsonProperty("service") + public void setService(String service) { + this.service = service; + } + + @JsonIgnore + public QuotaUsageBuilder edit() { + return new QuotaUsageBuilder(this); + } + + @JsonIgnore + public QuotaUsageBuilder 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-installer/src/generated/java/io/fabric8/openshift/api/model/installer/libvirt/v1/DnsmasqOption.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/gcp/v1/UserLabel.java similarity index 83% rename from kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/libvirt/v1/DnsmasqOption.java rename to kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/gcp/v1/UserLabel.java index da06b8f67b5..7d5f30b9c85 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/libvirt/v1/DnsmasqOption.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/gcp/v1/UserLabel.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.installer.libvirt.v1; +package io.fabric8.openshift.api.model.installer.gcp.v1; import java.util.LinkedHashMap; import java.util.Map; @@ -31,7 +31,7 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "name", + "key", "value" }) @ToString @@ -52,11 +52,11 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class DnsmasqOption implements Editable , KubernetesResource +public class UserLabel implements Editable , KubernetesResource { - @JsonProperty("name") - private String name; + @JsonProperty("key") + private String key; @JsonProperty("value") private String value; @JsonIgnore @@ -66,23 +66,23 @@ public class DnsmasqOption implements Editable , Kubernete * No args constructor for use in serialization * */ - public DnsmasqOption() { + public UserLabel() { } - public DnsmasqOption(String name, String value) { + public UserLabel(String key, String value) { super(); - this.name = name; + this.key = key; this.value = value; } - @JsonProperty("name") - public String getName() { - return name; + @JsonProperty("key") + public String getKey() { + return key; } - @JsonProperty("name") - public void setName(String name) { - this.name = name; + @JsonProperty("key") + public void setKey(String key) { + this.key = key; } @JsonProperty("value") @@ -96,12 +96,12 @@ public void setValue(String value) { } @JsonIgnore - public DnsmasqOptionBuilder edit() { - return new DnsmasqOptionBuilder(this); + public UserLabelBuilder edit() { + return new UserLabelBuilder(this); } @JsonIgnore - public DnsmasqOptionBuilder toBuilder() { + public UserLabelBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/gcp/v1/UserTag.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/gcp/v1/UserTag.java new file mode 100644 index 00000000000..dc4626e8b23 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/gcp/v1/UserTag.java @@ -0,0 +1,136 @@ + +package io.fabric8.openshift.api.model.installer.gcp.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({ + "key", + "parentID", + "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 UserTag implements Editable , KubernetesResource +{ + + @JsonProperty("key") + private String key; + @JsonProperty("parentID") + private String parentID; + @JsonProperty("value") + private String value; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public UserTag() { + } + + public UserTag(String key, String parentID, String value) { + super(); + this.key = key; + this.parentID = parentID; + this.value = value; + } + + @JsonProperty("key") + public String getKey() { + return key; + } + + @JsonProperty("key") + public void setKey(String key) { + this.key = key; + } + + @JsonProperty("parentID") + public String getParentID() { + return parentID; + } + + @JsonProperty("parentID") + public void setParentID(String parentID) { + this.parentID = parentID; + } + + @JsonProperty("value") + public String getValue() { + return value; + } + + @JsonProperty("value") + public void setValue(String value) { + this.value = value; + } + + @JsonIgnore + public UserTagBuilder edit() { + return new UserTagBuilder(this); + } + + @JsonIgnore + public UserTagBuilder 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-installer/src/generated/java/io/fabric8/openshift/api/model/installer/ibmcloud/v1/EndpointsJSON.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/ibmcloud/v1/EndpointsJSON.java new file mode 100644 index 00000000000..e5445e31762 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/ibmcloud/v1/EndpointsJSON.java @@ -0,0 +1,248 @@ + +package io.fabric8.openshift.api.model.installer.ibmcloud.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({ + "IBMCLOUD_CIS_API_ENDPOINT", + "IBMCLOUD_COS_CONFIG_ENDPOINT", + "IBMCLOUD_GS_API_ENDPOINT", + "IBMCLOUD_GT_API_ENDPOINT", + "IBMCLOUD_HPCS_API_ENDPOINT", + "IBMCLOUD_IAM_API_ENDPOINT", + "IBMCLOUD_IS_NG_API_ENDPOINT", + "IBMCLOUD_KP_API_ENDPOINT", + "IBMCLOUD_PRIVATE_DNS_API_ENDPOINT", + "IBMCLOUD_RESOURCE_CONTROLLER_API_ENDPOINT", + "IBMCLOUD_RESOURCE_MANAGEMENT_API_ENDPOINT" +}) +@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 EndpointsJSON implements Editable , KubernetesResource +{ + + @JsonProperty("IBMCLOUD_CIS_API_ENDPOINT") + private EndpointsVisibility iBMCLOUD_CIS_API_ENDPOINT; + @JsonProperty("IBMCLOUD_COS_CONFIG_ENDPOINT") + private EndpointsVisibility iBMCLOUD_COS_CONFIG_ENDPOINT; + @JsonProperty("IBMCLOUD_GS_API_ENDPOINT") + private EndpointsVisibility iBMCLOUD_GS_API_ENDPOINT; + @JsonProperty("IBMCLOUD_GT_API_ENDPOINT") + private EndpointsVisibility iBMCLOUD_GT_API_ENDPOINT; + @JsonProperty("IBMCLOUD_HPCS_API_ENDPOINT") + private EndpointsVisibility iBMCLOUD_HPCS_API_ENDPOINT; + @JsonProperty("IBMCLOUD_IAM_API_ENDPOINT") + private EndpointsVisibility iBMCLOUD_IAM_API_ENDPOINT; + @JsonProperty("IBMCLOUD_IS_NG_API_ENDPOINT") + private EndpointsVisibility iBMCLOUD_IS_NG_API_ENDPOINT; + @JsonProperty("IBMCLOUD_KP_API_ENDPOINT") + private EndpointsVisibility iBMCLOUD_KP_API_ENDPOINT; + @JsonProperty("IBMCLOUD_PRIVATE_DNS_API_ENDPOINT") + private EndpointsVisibility iBMCLOUD_PRIVATE_DNS_API_ENDPOINT; + @JsonProperty("IBMCLOUD_RESOURCE_CONTROLLER_API_ENDPOINT") + private EndpointsVisibility iBMCLOUD_RESOURCE_CONTROLLER_API_ENDPOINT; + @JsonProperty("IBMCLOUD_RESOURCE_MANAGEMENT_API_ENDPOINT") + private EndpointsVisibility iBMCLOUD_RESOURCE_MANAGEMENT_API_ENDPOINT; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public EndpointsJSON() { + } + + public EndpointsJSON(EndpointsVisibility iBMCLOUD_CIS_API_ENDPOINT, EndpointsVisibility iBMCLOUD_COS_CONFIG_ENDPOINT, EndpointsVisibility iBMCLOUD_GS_API_ENDPOINT, EndpointsVisibility iBMCLOUD_GT_API_ENDPOINT, EndpointsVisibility iBMCLOUD_HPCS_API_ENDPOINT, EndpointsVisibility iBMCLOUD_IAM_API_ENDPOINT, EndpointsVisibility iBMCLOUD_IS_NG_API_ENDPOINT, EndpointsVisibility iBMCLOUD_KP_API_ENDPOINT, EndpointsVisibility iBMCLOUD_PRIVATE_DNS_API_ENDPOINT, EndpointsVisibility iBMCLOUD_RESOURCE_CONTROLLER_API_ENDPOINT, EndpointsVisibility iBMCLOUD_RESOURCE_MANAGEMENT_API_ENDPOINT) { + super(); + this.iBMCLOUD_CIS_API_ENDPOINT = iBMCLOUD_CIS_API_ENDPOINT; + this.iBMCLOUD_COS_CONFIG_ENDPOINT = iBMCLOUD_COS_CONFIG_ENDPOINT; + this.iBMCLOUD_GS_API_ENDPOINT = iBMCLOUD_GS_API_ENDPOINT; + this.iBMCLOUD_GT_API_ENDPOINT = iBMCLOUD_GT_API_ENDPOINT; + this.iBMCLOUD_HPCS_API_ENDPOINT = iBMCLOUD_HPCS_API_ENDPOINT; + this.iBMCLOUD_IAM_API_ENDPOINT = iBMCLOUD_IAM_API_ENDPOINT; + this.iBMCLOUD_IS_NG_API_ENDPOINT = iBMCLOUD_IS_NG_API_ENDPOINT; + this.iBMCLOUD_KP_API_ENDPOINT = iBMCLOUD_KP_API_ENDPOINT; + this.iBMCLOUD_PRIVATE_DNS_API_ENDPOINT = iBMCLOUD_PRIVATE_DNS_API_ENDPOINT; + this.iBMCLOUD_RESOURCE_CONTROLLER_API_ENDPOINT = iBMCLOUD_RESOURCE_CONTROLLER_API_ENDPOINT; + this.iBMCLOUD_RESOURCE_MANAGEMENT_API_ENDPOINT = iBMCLOUD_RESOURCE_MANAGEMENT_API_ENDPOINT; + } + + @JsonProperty("IBMCLOUD_CIS_API_ENDPOINT") + public EndpointsVisibility getIBMCLOUD_CIS_API_ENDPOINT() { + return iBMCLOUD_CIS_API_ENDPOINT; + } + + @JsonProperty("IBMCLOUD_CIS_API_ENDPOINT") + public void setIBMCLOUD_CIS_API_ENDPOINT(EndpointsVisibility iBMCLOUD_CIS_API_ENDPOINT) { + this.iBMCLOUD_CIS_API_ENDPOINT = iBMCLOUD_CIS_API_ENDPOINT; + } + + @JsonProperty("IBMCLOUD_COS_CONFIG_ENDPOINT") + public EndpointsVisibility getIBMCLOUD_COS_CONFIG_ENDPOINT() { + return iBMCLOUD_COS_CONFIG_ENDPOINT; + } + + @JsonProperty("IBMCLOUD_COS_CONFIG_ENDPOINT") + public void setIBMCLOUD_COS_CONFIG_ENDPOINT(EndpointsVisibility iBMCLOUD_COS_CONFIG_ENDPOINT) { + this.iBMCLOUD_COS_CONFIG_ENDPOINT = iBMCLOUD_COS_CONFIG_ENDPOINT; + } + + @JsonProperty("IBMCLOUD_GS_API_ENDPOINT") + public EndpointsVisibility getIBMCLOUD_GS_API_ENDPOINT() { + return iBMCLOUD_GS_API_ENDPOINT; + } + + @JsonProperty("IBMCLOUD_GS_API_ENDPOINT") + public void setIBMCLOUD_GS_API_ENDPOINT(EndpointsVisibility iBMCLOUD_GS_API_ENDPOINT) { + this.iBMCLOUD_GS_API_ENDPOINT = iBMCLOUD_GS_API_ENDPOINT; + } + + @JsonProperty("IBMCLOUD_GT_API_ENDPOINT") + public EndpointsVisibility getIBMCLOUD_GT_API_ENDPOINT() { + return iBMCLOUD_GT_API_ENDPOINT; + } + + @JsonProperty("IBMCLOUD_GT_API_ENDPOINT") + public void setIBMCLOUD_GT_API_ENDPOINT(EndpointsVisibility iBMCLOUD_GT_API_ENDPOINT) { + this.iBMCLOUD_GT_API_ENDPOINT = iBMCLOUD_GT_API_ENDPOINT; + } + + @JsonProperty("IBMCLOUD_HPCS_API_ENDPOINT") + public EndpointsVisibility getIBMCLOUD_HPCS_API_ENDPOINT() { + return iBMCLOUD_HPCS_API_ENDPOINT; + } + + @JsonProperty("IBMCLOUD_HPCS_API_ENDPOINT") + public void setIBMCLOUD_HPCS_API_ENDPOINT(EndpointsVisibility iBMCLOUD_HPCS_API_ENDPOINT) { + this.iBMCLOUD_HPCS_API_ENDPOINT = iBMCLOUD_HPCS_API_ENDPOINT; + } + + @JsonProperty("IBMCLOUD_IAM_API_ENDPOINT") + public EndpointsVisibility getIBMCLOUD_IAM_API_ENDPOINT() { + return iBMCLOUD_IAM_API_ENDPOINT; + } + + @JsonProperty("IBMCLOUD_IAM_API_ENDPOINT") + public void setIBMCLOUD_IAM_API_ENDPOINT(EndpointsVisibility iBMCLOUD_IAM_API_ENDPOINT) { + this.iBMCLOUD_IAM_API_ENDPOINT = iBMCLOUD_IAM_API_ENDPOINT; + } + + @JsonProperty("IBMCLOUD_IS_NG_API_ENDPOINT") + public EndpointsVisibility getIBMCLOUD_IS_NG_API_ENDPOINT() { + return iBMCLOUD_IS_NG_API_ENDPOINT; + } + + @JsonProperty("IBMCLOUD_IS_NG_API_ENDPOINT") + public void setIBMCLOUD_IS_NG_API_ENDPOINT(EndpointsVisibility iBMCLOUD_IS_NG_API_ENDPOINT) { + this.iBMCLOUD_IS_NG_API_ENDPOINT = iBMCLOUD_IS_NG_API_ENDPOINT; + } + + @JsonProperty("IBMCLOUD_KP_API_ENDPOINT") + public EndpointsVisibility getIBMCLOUD_KP_API_ENDPOINT() { + return iBMCLOUD_KP_API_ENDPOINT; + } + + @JsonProperty("IBMCLOUD_KP_API_ENDPOINT") + public void setIBMCLOUD_KP_API_ENDPOINT(EndpointsVisibility iBMCLOUD_KP_API_ENDPOINT) { + this.iBMCLOUD_KP_API_ENDPOINT = iBMCLOUD_KP_API_ENDPOINT; + } + + @JsonProperty("IBMCLOUD_PRIVATE_DNS_API_ENDPOINT") + public EndpointsVisibility getIBMCLOUD_PRIVATE_DNS_API_ENDPOINT() { + return iBMCLOUD_PRIVATE_DNS_API_ENDPOINT; + } + + @JsonProperty("IBMCLOUD_PRIVATE_DNS_API_ENDPOINT") + public void setIBMCLOUD_PRIVATE_DNS_API_ENDPOINT(EndpointsVisibility iBMCLOUD_PRIVATE_DNS_API_ENDPOINT) { + this.iBMCLOUD_PRIVATE_DNS_API_ENDPOINT = iBMCLOUD_PRIVATE_DNS_API_ENDPOINT; + } + + @JsonProperty("IBMCLOUD_RESOURCE_CONTROLLER_API_ENDPOINT") + public EndpointsVisibility getIBMCLOUD_RESOURCE_CONTROLLER_API_ENDPOINT() { + return iBMCLOUD_RESOURCE_CONTROLLER_API_ENDPOINT; + } + + @JsonProperty("IBMCLOUD_RESOURCE_CONTROLLER_API_ENDPOINT") + public void setIBMCLOUD_RESOURCE_CONTROLLER_API_ENDPOINT(EndpointsVisibility iBMCLOUD_RESOURCE_CONTROLLER_API_ENDPOINT) { + this.iBMCLOUD_RESOURCE_CONTROLLER_API_ENDPOINT = iBMCLOUD_RESOURCE_CONTROLLER_API_ENDPOINT; + } + + @JsonProperty("IBMCLOUD_RESOURCE_MANAGEMENT_API_ENDPOINT") + public EndpointsVisibility getIBMCLOUD_RESOURCE_MANAGEMENT_API_ENDPOINT() { + return iBMCLOUD_RESOURCE_MANAGEMENT_API_ENDPOINT; + } + + @JsonProperty("IBMCLOUD_RESOURCE_MANAGEMENT_API_ENDPOINT") + public void setIBMCLOUD_RESOURCE_MANAGEMENT_API_ENDPOINT(EndpointsVisibility iBMCLOUD_RESOURCE_MANAGEMENT_API_ENDPOINT) { + this.iBMCLOUD_RESOURCE_MANAGEMENT_API_ENDPOINT = iBMCLOUD_RESOURCE_MANAGEMENT_API_ENDPOINT; + } + + @JsonIgnore + public EndpointsJSONBuilder edit() { + return new EndpointsJSONBuilder(this); + } + + @JsonIgnore + public EndpointsJSONBuilder 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-installer/src/generated/java/io/fabric8/openshift/api/model/installer/ibmcloud/v1/EndpointsVisibility.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/ibmcloud/v1/EndpointsVisibility.java new file mode 100644 index 00000000000..45396da2fe3 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/ibmcloud/v1/EndpointsVisibility.java @@ -0,0 +1,126 @@ + +package io.fabric8.openshift.api.model.installer.ibmcloud.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({ + "private", + "public" +}) +@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 EndpointsVisibility implements Editable , KubernetesResource +{ + + @JsonProperty("private") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private Map _private = new LinkedHashMap<>(); + @JsonProperty("public") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private Map _public = new LinkedHashMap<>(); + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public EndpointsVisibility() { + } + + public EndpointsVisibility(Map _private, Map _public) { + super(); + this._private = _private; + this._public = _public; + } + + @JsonProperty("private") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public Map getPrivate() { + return _private; + } + + @JsonProperty("private") + public void setPrivate(Map _private) { + this._private = _private; + } + + @JsonProperty("public") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public Map getPublic() { + return _public; + } + + @JsonProperty("public") + public void setPublic(Map _public) { + this._public = _public; + } + + @JsonIgnore + public EndpointsVisibilityBuilder edit() { + return new EndpointsVisibilityBuilder(this); + } + + @JsonIgnore + public EndpointsVisibilityBuilder 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-installer/src/generated/java/io/fabric8/openshift/api/model/installer/ibmcloud/v1/Metadata.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/ibmcloud/v1/Metadata.java new file mode 100644 index 00000000000..651d8352151 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/ibmcloud/v1/Metadata.java @@ -0,0 +1,227 @@ + +package io.fabric8.openshift.api.model.installer.ibmcloud.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.fabric8.openshift.api.model.config.v1.IBMCloudServiceEndpoint; +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({ + "accountID", + "baseDomain", + "cisInstanceCRN", + "dnsInstanceID", + "region", + "resourceGroupName", + "serviceEndpoints", + "subnets", + "vpc" +}) +@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 Metadata implements Editable , KubernetesResource +{ + + @JsonProperty("accountID") + private String accountID; + @JsonProperty("baseDomain") + private String baseDomain; + @JsonProperty("cisInstanceCRN") + private String cisInstanceCRN; + @JsonProperty("dnsInstanceID") + private String dnsInstanceID; + @JsonProperty("region") + private String region; + @JsonProperty("resourceGroupName") + private String resourceGroupName; + @JsonProperty("serviceEndpoints") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List serviceEndpoints = new ArrayList<>(); + @JsonProperty("subnets") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List subnets = new ArrayList<>(); + @JsonProperty("vpc") + private String vpc; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public Metadata() { + } + + public Metadata(String accountID, String baseDomain, String cisInstanceCRN, String dnsInstanceID, String region, String resourceGroupName, List serviceEndpoints, List subnets, String vpc) { + super(); + this.accountID = accountID; + this.baseDomain = baseDomain; + this.cisInstanceCRN = cisInstanceCRN; + this.dnsInstanceID = dnsInstanceID; + this.region = region; + this.resourceGroupName = resourceGroupName; + this.serviceEndpoints = serviceEndpoints; + this.subnets = subnets; + this.vpc = vpc; + } + + @JsonProperty("accountID") + public String getAccountID() { + return accountID; + } + + @JsonProperty("accountID") + public void setAccountID(String accountID) { + this.accountID = accountID; + } + + @JsonProperty("baseDomain") + public String getBaseDomain() { + return baseDomain; + } + + @JsonProperty("baseDomain") + public void setBaseDomain(String baseDomain) { + this.baseDomain = baseDomain; + } + + @JsonProperty("cisInstanceCRN") + public String getCisInstanceCRN() { + return cisInstanceCRN; + } + + @JsonProperty("cisInstanceCRN") + public void setCisInstanceCRN(String cisInstanceCRN) { + this.cisInstanceCRN = cisInstanceCRN; + } + + @JsonProperty("dnsInstanceID") + public String getDnsInstanceID() { + return dnsInstanceID; + } + + @JsonProperty("dnsInstanceID") + public void setDnsInstanceID(String dnsInstanceID) { + this.dnsInstanceID = dnsInstanceID; + } + + @JsonProperty("region") + public String getRegion() { + return region; + } + + @JsonProperty("region") + public void setRegion(String region) { + this.region = region; + } + + @JsonProperty("resourceGroupName") + public String getResourceGroupName() { + return resourceGroupName; + } + + @JsonProperty("resourceGroupName") + public void setResourceGroupName(String resourceGroupName) { + this.resourceGroupName = resourceGroupName; + } + + @JsonProperty("serviceEndpoints") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getServiceEndpoints() { + return serviceEndpoints; + } + + @JsonProperty("serviceEndpoints") + public void setServiceEndpoints(List serviceEndpoints) { + this.serviceEndpoints = serviceEndpoints; + } + + @JsonProperty("subnets") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getSubnets() { + return subnets; + } + + @JsonProperty("subnets") + public void setSubnets(List subnets) { + this.subnets = subnets; + } + + @JsonProperty("vpc") + public String getVpc() { + return vpc; + } + + @JsonProperty("vpc") + public void setVpc(String vpc) { + this.vpc = vpc; + } + + @JsonIgnore + public MetadataBuilder edit() { + return new MetadataBuilder(this); + } + + @JsonIgnore + public MetadataBuilder 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-installer/src/generated/java/io/fabric8/openshift/api/model/installer/ibmcloud/v1/Platform.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/ibmcloud/v1/Platform.java index e931ce936d8..0e68b20a5ca 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/ibmcloud/v1/Platform.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/ibmcloud/v1/Platform.java @@ -24,6 +24,7 @@ import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.fabric8.openshift.api.model.config.v1.IBMCloudServiceEndpoint; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; import lombok.EqualsAndHashCode; @@ -39,6 +40,7 @@ "networkResourceGroupName", "region", "resourceGroupName", + "serviceEndpoints", "vpcName" }) @ToString @@ -76,6 +78,9 @@ public class Platform implements Editable , KubernetesResource private String region; @JsonProperty("resourceGroupName") private String resourceGroupName; + @JsonProperty("serviceEndpoints") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List serviceEndpoints = new ArrayList<>(); @JsonProperty("vpcName") private String vpcName; @JsonIgnore @@ -88,7 +93,7 @@ public class Platform implements Editable , KubernetesResource public Platform() { } - public Platform(List computeSubnets, List controlPlaneSubnets, MachinePool defaultMachinePlatform, String networkResourceGroupName, String region, String resourceGroupName, String vpcName) { + public Platform(List computeSubnets, List controlPlaneSubnets, MachinePool defaultMachinePlatform, String networkResourceGroupName, String region, String resourceGroupName, List serviceEndpoints, String vpcName) { super(); this.computeSubnets = computeSubnets; this.controlPlaneSubnets = controlPlaneSubnets; @@ -96,6 +101,7 @@ public Platform(List computeSubnets, List controlPlaneSubnets, M this.networkResourceGroupName = networkResourceGroupName; this.region = region; this.resourceGroupName = resourceGroupName; + this.serviceEndpoints = serviceEndpoints; this.vpcName = vpcName; } @@ -161,6 +167,17 @@ public void setResourceGroupName(String resourceGroupName) { this.resourceGroupName = resourceGroupName; } + @JsonProperty("serviceEndpoints") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getServiceEndpoints() { + return serviceEndpoints; + } + + @JsonProperty("serviceEndpoints") + public void setServiceEndpoints(List serviceEndpoints) { + this.serviceEndpoints = serviceEndpoints; + } + @JsonProperty("vpcName") public String getVpcName() { return vpcName; diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/DataDisk.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/DataDisk.java new file mode 100644 index 00000000000..cc0e2351268 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/DataDisk.java @@ -0,0 +1,152 @@ + +package io.fabric8.openshift.api.model.installer.nutanix.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.fabric8.openshift.api.model.machine.v1.NutanixVMDiskDeviceProperties; +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({ + "dataSourceImage", + "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 DataDisk implements Editable , KubernetesResource +{ + + @JsonProperty("dataSourceImage") + private StorageResourceReference dataSourceImage; + @JsonProperty("deviceProperties") + private NutanixVMDiskDeviceProperties deviceProperties; + @JsonProperty("diskSize") + private Quantity diskSize; + @JsonProperty("storageConfig") + private StorageConfig storageConfig; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public DataDisk() { + } + + public DataDisk(StorageResourceReference dataSourceImage, NutanixVMDiskDeviceProperties deviceProperties, Quantity diskSize, StorageConfig storageConfig) { + super(); + this.dataSourceImage = dataSourceImage; + this.deviceProperties = deviceProperties; + this.diskSize = diskSize; + this.storageConfig = storageConfig; + } + + @JsonProperty("dataSourceImage") + public StorageResourceReference getDataSourceImage() { + return dataSourceImage; + } + + @JsonProperty("dataSourceImage") + public void setDataSourceImage(StorageResourceReference dataSourceImage) { + this.dataSourceImage = dataSourceImage; + } + + @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 StorageConfig getStorageConfig() { + return storageConfig; + } + + @JsonProperty("storageConfig") + public void setStorageConfig(StorageConfig storageConfig) { + this.storageConfig = storageConfig; + } + + @JsonIgnore + public DataDiskBuilder edit() { + return new DataDiskBuilder(this); + } + + @JsonIgnore + public DataDiskBuilder 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-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/FailureDomain.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/FailureDomain.java new file mode 100644 index 00000000000..6f0633a6111 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/FailureDomain.java @@ -0,0 +1,172 @@ + +package io.fabric8.openshift.api.model.installer.nutanix.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({ + "dataSourceImages", + "name", + "prismElement", + "storageContainers", + "subnetUUIDs" +}) +@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 FailureDomain implements Editable , KubernetesResource +{ + + @JsonProperty("dataSourceImages") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List dataSourceImages = new ArrayList<>(); + @JsonProperty("name") + private String name; + @JsonProperty("prismElement") + private PrismElement prismElement; + @JsonProperty("storageContainers") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List storageContainers = new ArrayList<>(); + @JsonProperty("subnetUUIDs") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List subnetUUIDs = new ArrayList<>(); + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public FailureDomain() { + } + + public FailureDomain(List dataSourceImages, String name, PrismElement prismElement, List storageContainers, List subnetUUIDs) { + super(); + this.dataSourceImages = dataSourceImages; + this.name = name; + this.prismElement = prismElement; + this.storageContainers = storageContainers; + this.subnetUUIDs = subnetUUIDs; + } + + @JsonProperty("dataSourceImages") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getDataSourceImages() { + return dataSourceImages; + } + + @JsonProperty("dataSourceImages") + public void setDataSourceImages(List dataSourceImages) { + this.dataSourceImages = dataSourceImages; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonProperty("prismElement") + public PrismElement getPrismElement() { + return prismElement; + } + + @JsonProperty("prismElement") + public void setPrismElement(PrismElement prismElement) { + this.prismElement = prismElement; + } + + @JsonProperty("storageContainers") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getStorageContainers() { + return storageContainers; + } + + @JsonProperty("storageContainers") + public void setStorageContainers(List storageContainers) { + this.storageContainers = storageContainers; + } + + @JsonProperty("subnetUUIDs") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getSubnetUUIDs() { + return subnetUUIDs; + } + + @JsonProperty("subnetUUIDs") + public void setSubnetUUIDs(List subnetUUIDs) { + this.subnetUUIDs = subnetUUIDs; + } + + @JsonIgnore + public FailureDomainBuilder edit() { + return new FailureDomainBuilder(this); + } + + @JsonIgnore + public FailureDomainBuilder 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-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/MachinePool.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/MachinePool.java index c8ea99cc6aa..2bcdf77cf54 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/MachinePool.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/MachinePool.java @@ -25,6 +25,7 @@ import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.openshift.api.model.machine.v1.NutanixCategory; +import io.fabric8.openshift.api.model.machine.v1.NutanixGPU; import io.fabric8.openshift.api.model.machine.v1.NutanixResourceIdentifier; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; @@ -39,6 +40,9 @@ "categories", "coresPerSocket", "cpus", + "dataDisks", + "failureDomains", + "gpus", "memoryMiB", "osDisk", "project" @@ -73,6 +77,15 @@ public class MachinePool implements Editable , KubernetesRes private Long coresPerSocket; @JsonProperty("cpus") private Long cpus; + @JsonProperty("dataDisks") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List dataDisks = new ArrayList<>(); + @JsonProperty("failureDomains") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List failureDomains = new ArrayList<>(); + @JsonProperty("gpus") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List gpus = new ArrayList<>(); @JsonProperty("memoryMiB") private Long memoryMiB; @JsonProperty("osDisk") @@ -89,12 +102,15 @@ public class MachinePool implements Editable , KubernetesRes public MachinePool() { } - public MachinePool(String bootType, List categories, Long coresPerSocket, Long cpus, Long memoryMiB, OSDisk osDisk, NutanixResourceIdentifier project) { + public MachinePool(String bootType, List categories, Long coresPerSocket, Long cpus, List dataDisks, List failureDomains, List gpus, Long memoryMiB, OSDisk osDisk, NutanixResourceIdentifier project) { super(); this.bootType = bootType; this.categories = categories; this.coresPerSocket = coresPerSocket; this.cpus = cpus; + this.dataDisks = dataDisks; + this.failureDomains = failureDomains; + this.gpus = gpus; this.memoryMiB = memoryMiB; this.osDisk = osDisk; this.project = project; @@ -141,6 +157,39 @@ public void setCpus(Long cpus) { this.cpus = cpus; } + @JsonProperty("dataDisks") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getDataDisks() { + return dataDisks; + } + + @JsonProperty("dataDisks") + public void setDataDisks(List dataDisks) { + this.dataDisks = dataDisks; + } + + @JsonProperty("failureDomains") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getFailureDomains() { + return failureDomains; + } + + @JsonProperty("failureDomains") + public void setFailureDomains(List failureDomains) { + this.failureDomains = failureDomains; + } + + @JsonProperty("gpus") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getGpus() { + return gpus; + } + + @JsonProperty("gpus") + public void setGpus(List gpus) { + this.gpus = gpus; + } + @JsonProperty("memoryMiB") public Long getMemoryMiB() { return memoryMiB; diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/Metadata.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/Metadata.java new file mode 100644 index 00000000000..71188acbf41 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/Metadata.java @@ -0,0 +1,150 @@ + +package io.fabric8.openshift.api.model.installer.nutanix.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({ + "password", + "port", + "prismCentral", + "username" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Generated("jsonschema2pojo") +public class Metadata implements Editable , KubernetesResource +{ + + @JsonProperty("password") + private String password; + @JsonProperty("port") + private String port; + @JsonProperty("prismCentral") + private String prismCentral; + @JsonProperty("username") + private String username; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public Metadata() { + } + + public Metadata(String password, String port, String prismCentral, String username) { + super(); + this.password = password; + this.port = port; + this.prismCentral = prismCentral; + this.username = username; + } + + @JsonProperty("password") + public String getPassword() { + return password; + } + + @JsonProperty("password") + public void setPassword(String password) { + this.password = password; + } + + @JsonProperty("port") + public String getPort() { + return port; + } + + @JsonProperty("port") + public void setPort(String port) { + this.port = port; + } + + @JsonProperty("prismCentral") + public String getPrismCentral() { + return prismCentral; + } + + @JsonProperty("prismCentral") + public void setPrismCentral(String prismCentral) { + this.prismCentral = prismCentral; + } + + @JsonProperty("username") + public String getUsername() { + return username; + } + + @JsonProperty("username") + public void setUsername(String username) { + this.username = username; + } + + @JsonIgnore + public MetadataBuilder edit() { + return new MetadataBuilder(this); + } + + @JsonIgnore + public MetadataBuilder 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-installer/src/generated/java/io/fabric8/openshift/api/model/installer/libvirt/v1/MachinePool.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/MetadataCloudInit.java similarity index 77% rename from kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/libvirt/v1/MachinePool.java rename to kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/MetadataCloudInit.java index c91f2b7050c..bc1d5b3119d 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/libvirt/v1/MachinePool.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/MetadataCloudInit.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.installer.libvirt.v1; +package io.fabric8.openshift.api.model.installer.nutanix.v1; import java.util.LinkedHashMap; import java.util.Map; @@ -8,6 +8,7 @@ import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.fabric8.kubernetes.api.builder.Editable; @@ -30,7 +31,7 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - + "uuid" }) @ToString @EqualsAndHashCode @@ -50,19 +51,43 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class MachinePool implements Editable , KubernetesResource +public class MetadataCloudInit implements Editable , KubernetesResource { + @JsonProperty("uuid") + private String uuid; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); + /** + * No args constructor for use in serialization + * + */ + public MetadataCloudInit() { + } + + public MetadataCloudInit(String uuid) { + super(); + this.uuid = uuid; + } + + @JsonProperty("uuid") + public String getUuid() { + return uuid; + } + + @JsonProperty("uuid") + public void setUuid(String uuid) { + this.uuid = uuid; + } + @JsonIgnore - public MachinePoolBuilder edit() { - return new MachinePoolBuilder(this); + public MetadataCloudInitBuilder edit() { + return new MetadataCloudInitBuilder(this); } @JsonIgnore - public MachinePoolBuilder toBuilder() { + public MetadataCloudInitBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/Platform.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/Platform.java index 6948ec9f37f..5dd94652307 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/Platform.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/Platform.java @@ -38,6 +38,7 @@ "apiVIPs", "clusterOSImage", "defaultMachinePlatform", + "failureDomains", "ingressVIP", "ingressVIPs", "loadBalancer", @@ -75,6 +76,9 @@ public class Platform implements Editable , KubernetesResource private String clusterOSImage; @JsonProperty("defaultMachinePlatform") private MachinePool defaultMachinePlatform; + @JsonProperty("failureDomains") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List failureDomains = new ArrayList<>(); @JsonProperty("ingressVIP") private String ingressVIP; @JsonProperty("ingressVIPs") @@ -100,12 +104,13 @@ public class Platform implements Editable , KubernetesResource public Platform() { } - public Platform(String apiVIP, List apiVIPs, String clusterOSImage, MachinePool defaultMachinePlatform, String ingressVIP, List ingressVIPs, NutanixPlatformLoadBalancer loadBalancer, PrismCentral prismCentral, List prismElements, List subnetUUIDs) { + public Platform(String apiVIP, List apiVIPs, String clusterOSImage, MachinePool defaultMachinePlatform, List failureDomains, String ingressVIP, List ingressVIPs, NutanixPlatformLoadBalancer loadBalancer, PrismCentral prismCentral, List prismElements, List subnetUUIDs) { super(); this.apiVIP = apiVIP; this.apiVIPs = apiVIPs; this.clusterOSImage = clusterOSImage; this.defaultMachinePlatform = defaultMachinePlatform; + this.failureDomains = failureDomains; this.ingressVIP = ingressVIP; this.ingressVIPs = ingressVIPs; this.loadBalancer = loadBalancer; @@ -155,6 +160,17 @@ public void setDefaultMachinePlatform(MachinePool defaultMachinePlatform) { this.defaultMachinePlatform = defaultMachinePlatform; } + @JsonProperty("failureDomains") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getFailureDomains() { + return failureDomains; + } + + @JsonProperty("failureDomains") + public void setFailureDomains(List failureDomains) { + this.failureDomains = failureDomains; + } + @JsonProperty("ingressVIP") public String getIngressVIP() { return ingressVIP; diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/StorageConfig.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/StorageConfig.java new file mode 100644 index 00000000000..0c5c678ff3a --- /dev/null +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/StorageConfig.java @@ -0,0 +1,122 @@ + +package io.fabric8.openshift.api.model.installer.nutanix.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 StorageConfig implements Editable , KubernetesResource +{ + + @JsonProperty("diskMode") + private String diskMode; + @JsonProperty("storageContainer") + private StorageResourceReference storageContainer; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public StorageConfig() { + } + + public StorageConfig(String diskMode, StorageResourceReference 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 StorageResourceReference getStorageContainer() { + return storageContainer; + } + + @JsonProperty("storageContainer") + public void setStorageContainer(StorageResourceReference storageContainer) { + this.storageContainer = storageContainer; + } + + @JsonIgnore + public StorageConfigBuilder edit() { + return new StorageConfigBuilder(this); + } + + @JsonIgnore + public StorageConfigBuilder 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-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/StorageResourceReference.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/StorageResourceReference.java new file mode 100644 index 00000000000..6ef49a47284 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/StorageResourceReference.java @@ -0,0 +1,136 @@ + +package io.fabric8.openshift.api.model.installer.nutanix.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", + "referenceName", + "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 StorageResourceReference implements Editable , KubernetesResource +{ + + @JsonProperty("name") + private String name; + @JsonProperty("referenceName") + private String referenceName; + @JsonProperty("uuid") + private String uuid; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public StorageResourceReference() { + } + + public StorageResourceReference(String name, String referenceName, String uuid) { + super(); + this.name = name; + this.referenceName = referenceName; + this.uuid = uuid; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonProperty("referenceName") + public String getReferenceName() { + return referenceName; + } + + @JsonProperty("referenceName") + public void setReferenceName(String referenceName) { + this.referenceName = referenceName; + } + + @JsonProperty("uuid") + public String getUuid() { + return uuid; + } + + @JsonProperty("uuid") + public void setUuid(String uuid) { + this.uuid = uuid; + } + + @JsonIgnore + public StorageResourceReferenceBuilder edit() { + return new StorageResourceReferenceBuilder(this); + } + + @JsonIgnore + public StorageResourceReferenceBuilder 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-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/FixedIP.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/FixedIP.java index dca6547b61c..35f454d4903 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/FixedIP.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/FixedIP.java @@ -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.v1alpha1.SubnetFilter; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; import lombok.EqualsAndHashCode; diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/MachinePool.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/MachinePool.java index 03cb552aba3..dc8b68fe350 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/MachinePool.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/MachinePool.java @@ -35,7 +35,6 @@ @JsonPropertyOrder({ "additionalNetworkIDs", "additionalSecurityGroupIDs", - "failureDomains", "rootVolume", "serverGroupPolicy", "type", @@ -68,9 +67,6 @@ public class MachinePool implements Editable , KubernetesRes @JsonProperty("additionalSecurityGroupIDs") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List additionalSecurityGroupIDs = new ArrayList<>(); - @JsonProperty("failureDomains") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List failureDomains = new ArrayList<>(); @JsonProperty("rootVolume") private RootVolume rootVolume; @JsonProperty("serverGroupPolicy") @@ -90,11 +86,10 @@ public class MachinePool implements Editable , KubernetesRes public MachinePool() { } - public MachinePool(List additionalNetworkIDs, List additionalSecurityGroupIDs, List failureDomains, RootVolume rootVolume, String serverGroupPolicy, String type, List zones) { + public MachinePool(List additionalNetworkIDs, List additionalSecurityGroupIDs, RootVolume rootVolume, String serverGroupPolicy, String type, List zones) { super(); this.additionalNetworkIDs = additionalNetworkIDs; this.additionalSecurityGroupIDs = additionalSecurityGroupIDs; - this.failureDomains = failureDomains; this.rootVolume = rootVolume; this.serverGroupPolicy = serverGroupPolicy; this.type = type; @@ -123,17 +118,6 @@ public void setAdditionalSecurityGroupIDs(List additionalSecurityGroupID this.additionalSecurityGroupIDs = additionalSecurityGroupIDs; } - @JsonProperty("failureDomains") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getFailureDomains() { - return failureDomains; - } - - @JsonProperty("failureDomains") - public void setFailureDomains(List failureDomains) { - this.failureDomains = failureDomains; - } - @JsonProperty("rootVolume") public RootVolume getRootVolume() { return rootVolume; diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/Metadata.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/Metadata.java new file mode 100644 index 00000000000..509f4a52c8c --- /dev/null +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/Metadata.java @@ -0,0 +1,124 @@ + +package io.fabric8.openshift.api.model.installer.openstack.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({ + "cloud", + "identifier" +}) +@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 Metadata implements Editable , KubernetesResource +{ + + @JsonProperty("cloud") + private String cloud; + @JsonProperty("identifier") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private Map identifier = new LinkedHashMap<>(); + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public Metadata() { + } + + public Metadata(String cloud, Map identifier) { + super(); + this.cloud = cloud; + this.identifier = identifier; + } + + @JsonProperty("cloud") + public String getCloud() { + return cloud; + } + + @JsonProperty("cloud") + public void setCloud(String cloud) { + this.cloud = cloud; + } + + @JsonProperty("identifier") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public Map getIdentifier() { + return identifier; + } + + @JsonProperty("identifier") + public void setIdentifier(Map identifier) { + this.identifier = identifier; + } + + @JsonIgnore + public MetadataBuilder edit() { + return new MetadataBuilder(this); + } + + @JsonIgnore + public MetadataBuilder 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-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/Platform.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/Platform.java index aa938d8f394..de5e4dee236 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/Platform.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/Platform.java @@ -41,6 +41,7 @@ "clusterOSImage", "clusterOSImageProperties", "computeFlavor", + "controlPlanePort", "defaultMachinePlatform", "externalDNS", "externalNetwork", @@ -91,6 +92,8 @@ public class Platform implements Editable , KubernetesResource private Map clusterOSImageProperties = new LinkedHashMap<>(); @JsonProperty("computeFlavor") private String computeFlavor; + @JsonProperty("controlPlanePort") + private PortTarget controlPlanePort; @JsonProperty("defaultMachinePlatform") private MachinePool defaultMachinePlatform; @JsonProperty("externalDNS") @@ -127,7 +130,7 @@ public class Platform implements Editable , KubernetesResource public Platform() { } - public Platform(String apiFloatingIP, String apiVIP, List apiVIPs, String cloud, String clusterOSImage, Map clusterOSImageProperties, String computeFlavor, MachinePool defaultMachinePlatform, List externalDNS, String externalNetwork, String ingressFloatingIP, String ingressVIP, List ingressVIPs, String lbFloatingIP, OpenStackPlatformLoadBalancer loadBalancer, String machinesSubnet, String octaviaSupport, String region, String trunkSupport) { + public Platform(String apiFloatingIP, String apiVIP, List apiVIPs, String cloud, String clusterOSImage, Map clusterOSImageProperties, String computeFlavor, PortTarget controlPlanePort, MachinePool defaultMachinePlatform, List externalDNS, String externalNetwork, String ingressFloatingIP, String ingressVIP, List ingressVIPs, String lbFloatingIP, OpenStackPlatformLoadBalancer loadBalancer, String machinesSubnet, String octaviaSupport, String region, String trunkSupport) { super(); this.apiFloatingIP = apiFloatingIP; this.apiVIP = apiVIP; @@ -136,6 +139,7 @@ public Platform(String apiFloatingIP, String apiVIP, List apiVIPs, Strin this.clusterOSImage = clusterOSImage; this.clusterOSImageProperties = clusterOSImageProperties; this.computeFlavor = computeFlavor; + this.controlPlanePort = controlPlanePort; this.defaultMachinePlatform = defaultMachinePlatform; this.externalDNS = externalDNS; this.externalNetwork = externalNetwork; @@ -222,6 +226,16 @@ public void setComputeFlavor(String computeFlavor) { this.computeFlavor = computeFlavor; } + @JsonProperty("controlPlanePort") + public PortTarget getControlPlanePort() { + return controlPlanePort; + } + + @JsonProperty("controlPlanePort") + public void setControlPlanePort(PortTarget controlPlanePort) { + this.controlPlanePort = controlPlanePort; + } + @JsonProperty("defaultMachinePlatform") public MachinePool getDefaultMachinePlatform() { return defaultMachinePlatform; diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/NamedPortTarget.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/PortTarget.java similarity index 86% rename from kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/NamedPortTarget.java rename to kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/PortTarget.java index 349c405948b..66f3724f057 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/NamedPortTarget.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/PortTarget.java @@ -34,7 +34,6 @@ @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ "fixedIPs", - "id", "network" }) @ToString @@ -55,14 +54,12 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class NamedPortTarget implements Editable , KubernetesResource +public class PortTarget implements Editable , KubernetesResource { @JsonProperty("fixedIPs") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List fixedIPs = new ArrayList<>(); - @JsonProperty("id") - private String id; @JsonProperty("network") private NetworkFilter network; @JsonIgnore @@ -72,13 +69,12 @@ public class NamedPortTarget implements Editable , Kuber * No args constructor for use in serialization * */ - public NamedPortTarget() { + public PortTarget() { } - public NamedPortTarget(List fixedIPs, String id, NetworkFilter network) { + public PortTarget(List fixedIPs, NetworkFilter network) { super(); this.fixedIPs = fixedIPs; - this.id = id; this.network = network; } @@ -93,16 +89,6 @@ public void setFixedIPs(List fixedIPs) { this.fixedIPs = fixedIPs; } - @JsonProperty("id") - public String getId() { - return id; - } - - @JsonProperty("id") - public void setId(String id) { - this.id = id; - } - @JsonProperty("network") public NetworkFilter getNetwork() { return network; @@ -114,12 +100,12 @@ public void setNetwork(NetworkFilter network) { } @JsonIgnore - public NamedPortTargetBuilder edit() { - return new NamedPortTargetBuilder(this); + public PortTargetBuilder edit() { + return new PortTargetBuilder(this); } @JsonIgnore - public NamedPortTargetBuilder toBuilder() { + public PortTargetBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/RootVolume.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/RootVolume.java index 2e3409a2b3b..9b35a0aac1c 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/RootVolume.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/RootVolume.java @@ -35,6 +35,7 @@ @JsonPropertyOrder({ "size", "type", + "types", "zones" }) @ToString @@ -62,6 +63,9 @@ public class RootVolume implements Editable , KubernetesResou private Integer size; @JsonProperty("type") private String type; + @JsonProperty("types") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List types = new ArrayList<>(); @JsonProperty("zones") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List zones = new ArrayList<>(); @@ -75,10 +79,11 @@ public class RootVolume implements Editable , KubernetesResou public RootVolume() { } - public RootVolume(Integer size, String type, List zones) { + public RootVolume(Integer size, String type, List types, List zones) { super(); this.size = size; this.type = type; + this.types = types; this.zones = zones; } @@ -102,6 +107,17 @@ public void setType(String type) { this.type = type; } + @JsonProperty("types") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getTypes() { + return types; + } + + @JsonProperty("types") + public void setTypes(List types) { + this.types = types; + } + @JsonProperty("zones") @JsonInclude(JsonInclude.Include.NON_EMPTY) public List getZones() { diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/SubnetFilter.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/SubnetFilter.java new file mode 100644 index 00000000000..c633eedd830 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/SubnetFilter.java @@ -0,0 +1,122 @@ + +package io.fabric8.openshift.api.model.installer.openstack.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" +}) +@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 SubnetFilter implements Editable , KubernetesResource +{ + + @JsonProperty("id") + private String id; + @JsonProperty("name") + private String name; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public SubnetFilter() { + } + + public SubnetFilter(String id, String name) { + super(); + this.id = id; + this.name = name; + } + + @JsonProperty("id") + public String getId() { + return id; + } + + @JsonProperty("id") + public void setId(String id) { + this.id = id; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonIgnore + public SubnetFilterBuilder edit() { + return new SubnetFilterBuilder(this); + } + + @JsonIgnore + public SubnetFilterBuilder 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-installer/src/generated/java/io/fabric8/openshift/api/model/installer/ovirt/v1/Metadata.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/ovirt/v1/Metadata.java new file mode 100644 index 00000000000..9e48a102738 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/ovirt/v1/Metadata.java @@ -0,0 +1,122 @@ + +package io.fabric8.openshift.api.model.installer.ovirt.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({ + "cluster_id", + "remove_template" +}) +@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 Metadata implements Editable , KubernetesResource +{ + + @JsonProperty("cluster_id") + private String cluster_id; + @JsonProperty("remove_template") + private Boolean remove_template; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public Metadata() { + } + + public Metadata(String cluster_id, Boolean remove_template) { + super(); + this.cluster_id = cluster_id; + this.remove_template = remove_template; + } + + @JsonProperty("cluster_id") + public String getCluster_id() { + return cluster_id; + } + + @JsonProperty("cluster_id") + public void setCluster_id(String cluster_id) { + this.cluster_id = cluster_id; + } + + @JsonProperty("remove_template") + public Boolean getRemove_template() { + return remove_template; + } + + @JsonProperty("remove_template") + public void setRemove_template(Boolean remove_template) { + this.remove_template = remove_template; + } + + @JsonIgnore + public MetadataBuilder edit() { + return new MetadataBuilder(this); + } + + @JsonIgnore + public MetadataBuilder 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-installer/src/generated/java/io/fabric8/openshift/api/model/installer/ovirt/v1/Platform.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/ovirt/v1/Platform.java index 3793f6ce108..0a1a282d085 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/ovirt/v1/Platform.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/ovirt/v1/Platform.java @@ -71,25 +71,25 @@ public class Platform implements Editable , KubernetesResource @JsonInclude(JsonInclude.Include.NON_EMPTY) private List affinityGroups = new ArrayList<>(); @JsonProperty("api_vip") - private String apiVip; + private String api_vip; @JsonProperty("api_vips") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List apiVips = new ArrayList<>(); + private List api_vips = new ArrayList<>(); @JsonProperty("defaultMachinePlatform") private MachinePool defaultMachinePlatform; @JsonProperty("ingress_vip") - private String ingressVip; + private String ingress_vip; @JsonProperty("ingress_vips") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List ingressVips = new ArrayList<>(); + private List ingress_vips = new ArrayList<>(); @JsonProperty("loadBalancer") private OvirtPlatformLoadBalancer loadBalancer; @JsonProperty("ovirt_cluster_id") - private String ovirtClusterId; + private String ovirt_cluster_id; @JsonProperty("ovirt_network_name") - private String ovirtNetworkName; + private String ovirt_network_name; @JsonProperty("ovirt_storage_domain_id") - private String ovirtStorageDomainId; + private String ovirt_storage_domain_id; @JsonProperty("vnicProfileID") private String vnicProfileID; @JsonIgnore @@ -102,18 +102,18 @@ public class Platform implements Editable , KubernetesResource public Platform() { } - public Platform(List affinityGroups, String apiVip, List apiVips, MachinePool defaultMachinePlatform, String ingressVip, List ingressVips, OvirtPlatformLoadBalancer loadBalancer, String ovirtClusterId, String ovirtNetworkName, String ovirtStorageDomainId, String vnicProfileID) { + public Platform(List affinityGroups, String api_vip, List api_vips, MachinePool defaultMachinePlatform, String ingress_vip, List ingress_vips, OvirtPlatformLoadBalancer loadBalancer, String ovirt_cluster_id, String ovirt_network_name, String ovirt_storage_domain_id, String vnicProfileID) { super(); this.affinityGroups = affinityGroups; - this.apiVip = apiVip; - this.apiVips = apiVips; + this.api_vip = api_vip; + this.api_vips = api_vips; this.defaultMachinePlatform = defaultMachinePlatform; - this.ingressVip = ingressVip; - this.ingressVips = ingressVips; + this.ingress_vip = ingress_vip; + this.ingress_vips = ingress_vips; this.loadBalancer = loadBalancer; - this.ovirtClusterId = ovirtClusterId; - this.ovirtNetworkName = ovirtNetworkName; - this.ovirtStorageDomainId = ovirtStorageDomainId; + this.ovirt_cluster_id = ovirt_cluster_id; + this.ovirt_network_name = ovirt_network_name; + this.ovirt_storage_domain_id = ovirt_storage_domain_id; this.vnicProfileID = vnicProfileID; } @@ -129,24 +129,24 @@ public void setAffinityGroups(List affinityGroups) { } @JsonProperty("api_vip") - public String getApiVip() { - return apiVip; + public String getApi_vip() { + return api_vip; } @JsonProperty("api_vip") - public void setApiVip(String apiVip) { - this.apiVip = apiVip; + public void setApi_vip(String api_vip) { + this.api_vip = api_vip; } @JsonProperty("api_vips") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getApiVips() { - return apiVips; + public List getApi_vips() { + return api_vips; } @JsonProperty("api_vips") - public void setApiVips(List apiVips) { - this.apiVips = apiVips; + public void setApi_vips(List api_vips) { + this.api_vips = api_vips; } @JsonProperty("defaultMachinePlatform") @@ -160,24 +160,24 @@ public void setDefaultMachinePlatform(MachinePool defaultMachinePlatform) { } @JsonProperty("ingress_vip") - public String getIngressVip() { - return ingressVip; + public String getIngress_vip() { + return ingress_vip; } @JsonProperty("ingress_vip") - public void setIngressVip(String ingressVip) { - this.ingressVip = ingressVip; + public void setIngress_vip(String ingress_vip) { + this.ingress_vip = ingress_vip; } @JsonProperty("ingress_vips") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getIngressVips() { - return ingressVips; + public List getIngress_vips() { + return ingress_vips; } @JsonProperty("ingress_vips") - public void setIngressVips(List ingressVips) { - this.ingressVips = ingressVips; + public void setIngress_vips(List ingress_vips) { + this.ingress_vips = ingress_vips; } @JsonProperty("loadBalancer") @@ -191,33 +191,33 @@ public void setLoadBalancer(OvirtPlatformLoadBalancer loadBalancer) { } @JsonProperty("ovirt_cluster_id") - public String getOvirtClusterId() { - return ovirtClusterId; + public String getOvirt_cluster_id() { + return ovirt_cluster_id; } @JsonProperty("ovirt_cluster_id") - public void setOvirtClusterId(String ovirtClusterId) { - this.ovirtClusterId = ovirtClusterId; + public void setOvirt_cluster_id(String ovirt_cluster_id) { + this.ovirt_cluster_id = ovirt_cluster_id; } @JsonProperty("ovirt_network_name") - public String getOvirtNetworkName() { - return ovirtNetworkName; + public String getOvirt_network_name() { + return ovirt_network_name; } @JsonProperty("ovirt_network_name") - public void setOvirtNetworkName(String ovirtNetworkName) { - this.ovirtNetworkName = ovirtNetworkName; + public void setOvirt_network_name(String ovirt_network_name) { + this.ovirt_network_name = ovirt_network_name; } @JsonProperty("ovirt_storage_domain_id") - public String getOvirtStorageDomainId() { - return ovirtStorageDomainId; + public String getOvirt_storage_domain_id() { + return ovirt_storage_domain_id; } @JsonProperty("ovirt_storage_domain_id") - public void setOvirtStorageDomainId(String ovirtStorageDomainId) { - this.ovirtStorageDomainId = ovirtStorageDomainId; + public void setOvirt_storage_domain_id(String ovirt_storage_domain_id) { + this.ovirt_storage_domain_id = ovirt_storage_domain_id; } @JsonProperty("vnicProfileID") diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/powervs/v1/MachinePool.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/powervs/v1/MachinePool.java index 8023827505e..6b327b71e43 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/powervs/v1/MachinePool.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/powervs/v1/MachinePool.java @@ -15,6 +15,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.fabric8.kubernetes.api.builder.Editable; import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; import io.fabric8.kubernetes.api.model.KubernetesResource; import io.fabric8.kubernetes.api.model.LabelSelector; import io.fabric8.kubernetes.api.model.LocalObjectReference; @@ -35,6 +36,7 @@ "memoryGiB", "procType", "processors", + "smtLevel", "sysType", "volumeIDs" }) @@ -50,7 +52,7 @@ @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @BuildableReference(ResourceRequirements.class), - @BuildableReference(io.fabric8.kubernetes.api.model.IntOrString.class), + @BuildableReference(IntOrString.class), @BuildableReference(ObjectReference.class), @BuildableReference(LocalObjectReference.class), @BuildableReference(PersistentVolumeClaim.class) @@ -64,7 +66,9 @@ public class MachinePool implements Editable , KubernetesRes @JsonProperty("procType") private String procType; @JsonProperty("processors") - private io.fabric8.kubernetes.api.model.IntOrString processors; + private IntOrString processors; + @JsonProperty("smtLevel") + private String smtLevel; @JsonProperty("sysType") private String sysType; @JsonProperty("volumeIDs") @@ -80,11 +84,12 @@ public class MachinePool implements Editable , KubernetesRes public MachinePool() { } - public MachinePool(Integer memoryGiB, String procType, io.fabric8.kubernetes.api.model.IntOrString processors, String sysType, List volumeIDs) { + public MachinePool(Integer memoryGiB, String procType, IntOrString processors, String smtLevel, String sysType, List volumeIDs) { super(); this.memoryGiB = memoryGiB; this.procType = procType; this.processors = processors; + this.smtLevel = smtLevel; this.sysType = sysType; this.volumeIDs = volumeIDs; } @@ -110,15 +115,25 @@ public void setProcType(String procType) { } @JsonProperty("processors") - public io.fabric8.kubernetes.api.model.IntOrString getProcessors() { + public IntOrString getProcessors() { return processors; } @JsonProperty("processors") - public void setProcessors(io.fabric8.kubernetes.api.model.IntOrString processors) { + public void setProcessors(IntOrString processors) { this.processors = processors; } + @JsonProperty("smtLevel") + public String getSmtLevel() { + return smtLevel; + } + + @JsonProperty("smtLevel") + public void setSmtLevel(String smtLevel) { + this.smtLevel = smtLevel; + } + @JsonProperty("sysType") public String getSysType() { return sysType; diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/powervs/v1/Metadata.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/powervs/v1/Metadata.java new file mode 100644 index 00000000000..b0fd0b32e13 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/powervs/v1/Metadata.java @@ -0,0 +1,239 @@ + +package io.fabric8.openshift.api.model.installer.powervs.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.fabric8.openshift.api.model.config.v1.PowerVSServiceEndpoint; +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({ + "BaseDomain", + "cisInstanceCRN", + "dnsInstanceCRN", + "powerVSResourceGroup", + "region", + "serviceEndpoints", + "serviceInstanceGUID", + "transitGatewayName", + "vpcRegion", + "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 Metadata implements Editable , KubernetesResource +{ + + @JsonProperty("BaseDomain") + private String baseDomain; + @JsonProperty("cisInstanceCRN") + private String cisInstanceCRN; + @JsonProperty("dnsInstanceCRN") + private String dnsInstanceCRN; + @JsonProperty("powerVSResourceGroup") + private String powerVSResourceGroup; + @JsonProperty("region") + private String region; + @JsonProperty("serviceEndpoints") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List serviceEndpoints = new ArrayList<>(); + @JsonProperty("serviceInstanceGUID") + private String serviceInstanceGUID; + @JsonProperty("transitGatewayName") + private String transitGatewayName; + @JsonProperty("vpcRegion") + private String vpcRegion; + @JsonProperty("zone") + private String zone; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public Metadata() { + } + + public Metadata(String baseDomain, String cisInstanceCRN, String dnsInstanceCRN, String powerVSResourceGroup, String region, List serviceEndpoints, String serviceInstanceGUID, String transitGatewayName, String vpcRegion, String zone) { + super(); + this.baseDomain = baseDomain; + this.cisInstanceCRN = cisInstanceCRN; + this.dnsInstanceCRN = dnsInstanceCRN; + this.powerVSResourceGroup = powerVSResourceGroup; + this.region = region; + this.serviceEndpoints = serviceEndpoints; + this.serviceInstanceGUID = serviceInstanceGUID; + this.transitGatewayName = transitGatewayName; + this.vpcRegion = vpcRegion; + this.zone = zone; + } + + @JsonProperty("BaseDomain") + public String getBaseDomain() { + return baseDomain; + } + + @JsonProperty("BaseDomain") + public void setBaseDomain(String baseDomain) { + this.baseDomain = baseDomain; + } + + @JsonProperty("cisInstanceCRN") + public String getCisInstanceCRN() { + return cisInstanceCRN; + } + + @JsonProperty("cisInstanceCRN") + public void setCisInstanceCRN(String cisInstanceCRN) { + this.cisInstanceCRN = cisInstanceCRN; + } + + @JsonProperty("dnsInstanceCRN") + public String getDnsInstanceCRN() { + return dnsInstanceCRN; + } + + @JsonProperty("dnsInstanceCRN") + public void setDnsInstanceCRN(String dnsInstanceCRN) { + this.dnsInstanceCRN = dnsInstanceCRN; + } + + @JsonProperty("powerVSResourceGroup") + public String getPowerVSResourceGroup() { + return powerVSResourceGroup; + } + + @JsonProperty("powerVSResourceGroup") + public void setPowerVSResourceGroup(String powerVSResourceGroup) { + this.powerVSResourceGroup = powerVSResourceGroup; + } + + @JsonProperty("region") + public String getRegion() { + return region; + } + + @JsonProperty("region") + public void setRegion(String region) { + this.region = region; + } + + @JsonProperty("serviceEndpoints") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getServiceEndpoints() { + return serviceEndpoints; + } + + @JsonProperty("serviceEndpoints") + public void setServiceEndpoints(List serviceEndpoints) { + this.serviceEndpoints = serviceEndpoints; + } + + @JsonProperty("serviceInstanceGUID") + public String getServiceInstanceGUID() { + return serviceInstanceGUID; + } + + @JsonProperty("serviceInstanceGUID") + public void setServiceInstanceGUID(String serviceInstanceGUID) { + this.serviceInstanceGUID = serviceInstanceGUID; + } + + @JsonProperty("transitGatewayName") + public String getTransitGatewayName() { + return transitGatewayName; + } + + @JsonProperty("transitGatewayName") + public void setTransitGatewayName(String transitGatewayName) { + this.transitGatewayName = transitGatewayName; + } + + @JsonProperty("vpcRegion") + public String getVpcRegion() { + return vpcRegion; + } + + @JsonProperty("vpcRegion") + public void setVpcRegion(String vpcRegion) { + this.vpcRegion = vpcRegion; + } + + @JsonProperty("zone") + public String getZone() { + return zone; + } + + @JsonProperty("zone") + public void setZone(String zone) { + this.zone = zone; + } + + @JsonIgnore + public MetadataBuilder edit() { + return new MetadataBuilder(this); + } + + @JsonIgnore + public MetadataBuilder 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-installer/src/generated/java/io/fabric8/openshift/api/model/installer/powervs/v1/Platform.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/powervs/v1/Platform.java index 8e1a1d5043b..2468a82712e 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/powervs/v1/Platform.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/powervs/v1/Platform.java @@ -24,6 +24,7 @@ import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.fabric8.openshift.api.model.config.v1.PowerVSServiceEndpoint; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; import lombok.EqualsAndHashCode; @@ -33,13 +34,13 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "cloudConnectionName", "clusterOSImage", "defaultMachinePlatform", "powervsResourceGroup", - "pvsNetworkName", "region", - "serviceInstanceID", + "serviceEndpoints", + "serviceInstanceGUID", + "tgName", "userID", "vpcName", "vpcRegion", @@ -67,20 +68,21 @@ public class Platform implements Editable , KubernetesResource { - @JsonProperty("cloudConnectionName") - private String cloudConnectionName; @JsonProperty("clusterOSImage") private String clusterOSImage; @JsonProperty("defaultMachinePlatform") private MachinePool defaultMachinePlatform; @JsonProperty("powervsResourceGroup") private String powervsResourceGroup; - @JsonProperty("pvsNetworkName") - private String pvsNetworkName; @JsonProperty("region") private String region; - @JsonProperty("serviceInstanceID") - private String serviceInstanceID; + @JsonProperty("serviceEndpoints") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List serviceEndpoints = new ArrayList<>(); + @JsonProperty("serviceInstanceGUID") + private String serviceInstanceGUID; + @JsonProperty("tgName") + private String tgName; @JsonProperty("userID") private String userID; @JsonProperty("vpcName") @@ -102,15 +104,15 @@ public class Platform implements Editable , KubernetesResource public Platform() { } - public Platform(String cloudConnectionName, String clusterOSImage, MachinePool defaultMachinePlatform, String powervsResourceGroup, String pvsNetworkName, String region, String serviceInstanceID, String userID, String vpcName, String vpcRegion, List vpcSubnets, String zone) { + public Platform(String clusterOSImage, MachinePool defaultMachinePlatform, String powervsResourceGroup, String region, List serviceEndpoints, String serviceInstanceGUID, String tgName, String userID, String vpcName, String vpcRegion, List vpcSubnets, String zone) { super(); - this.cloudConnectionName = cloudConnectionName; this.clusterOSImage = clusterOSImage; this.defaultMachinePlatform = defaultMachinePlatform; this.powervsResourceGroup = powervsResourceGroup; - this.pvsNetworkName = pvsNetworkName; this.region = region; - this.serviceInstanceID = serviceInstanceID; + this.serviceEndpoints = serviceEndpoints; + this.serviceInstanceGUID = serviceInstanceGUID; + this.tgName = tgName; this.userID = userID; this.vpcName = vpcName; this.vpcRegion = vpcRegion; @@ -118,16 +120,6 @@ public Platform(String cloudConnectionName, String clusterOSImage, MachinePool d this.zone = zone; } - @JsonProperty("cloudConnectionName") - public String getCloudConnectionName() { - return cloudConnectionName; - } - - @JsonProperty("cloudConnectionName") - public void setCloudConnectionName(String cloudConnectionName) { - this.cloudConnectionName = cloudConnectionName; - } - @JsonProperty("clusterOSImage") public String getClusterOSImage() { return clusterOSImage; @@ -158,16 +150,6 @@ public void setPowervsResourceGroup(String powervsResourceGroup) { this.powervsResourceGroup = powervsResourceGroup; } - @JsonProperty("pvsNetworkName") - public String getPvsNetworkName() { - return pvsNetworkName; - } - - @JsonProperty("pvsNetworkName") - public void setPvsNetworkName(String pvsNetworkName) { - this.pvsNetworkName = pvsNetworkName; - } - @JsonProperty("region") public String getRegion() { return region; @@ -178,14 +160,35 @@ public void setRegion(String region) { this.region = region; } - @JsonProperty("serviceInstanceID") - public String getServiceInstanceID() { - return serviceInstanceID; + @JsonProperty("serviceEndpoints") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getServiceEndpoints() { + return serviceEndpoints; + } + + @JsonProperty("serviceEndpoints") + public void setServiceEndpoints(List serviceEndpoints) { + this.serviceEndpoints = serviceEndpoints; + } + + @JsonProperty("serviceInstanceGUID") + public String getServiceInstanceGUID() { + return serviceInstanceGUID; + } + + @JsonProperty("serviceInstanceGUID") + public void setServiceInstanceGUID(String serviceInstanceGUID) { + this.serviceInstanceGUID = serviceInstanceGUID; + } + + @JsonProperty("tgName") + public String getTgName() { + return tgName; } - @JsonProperty("serviceInstanceID") - public void setServiceInstanceID(String serviceInstanceID) { - this.serviceInstanceID = serviceInstanceID; + @JsonProperty("tgName") + public void setTgName(String tgName) { + this.tgName = tgName; } @JsonProperty("userID") diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/alibabacloud/v1/MachinePool.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/powervs/v1/Region.java similarity index 58% rename from kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/alibabacloud/v1/MachinePool.java rename to kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/powervs/v1/Region.java index a2e89431097..f357eeb80e0 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/alibabacloud/v1/MachinePool.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/powervs/v1/Region.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.installer.alibabacloud.v1; +package io.fabric8.openshift.api.model.installer.powervs.v1; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -33,11 +33,12 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "imageID", - "instanceType", - "systemDiskCategory", - "systemDiskSize", - "zones" + "COSRegion", + "Description", + "SysTypes", + "VPCRegion", + "VPCZones", + "Zones" }) @ToString @EqualsAndHashCode @@ -57,18 +58,22 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class MachinePool implements Editable , KubernetesResource +public class Region implements Editable , KubernetesResource { - @JsonProperty("imageID") - private String imageID; - @JsonProperty("instanceType") - private String instanceType; - @JsonProperty("systemDiskCategory") - private String systemDiskCategory; - @JsonProperty("systemDiskSize") - private Integer systemDiskSize; - @JsonProperty("zones") + @JsonProperty("COSRegion") + private String cOSRegion; + @JsonProperty("Description") + private String description; + @JsonProperty("SysTypes") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List sysTypes = new ArrayList<>(); + @JsonProperty("VPCRegion") + private String vPCRegion; + @JsonProperty("VPCZones") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List vPCZones = new ArrayList<>(); + @JsonProperty("Zones") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List zones = new ArrayList<>(); @JsonIgnore @@ -78,76 +83,89 @@ public class MachinePool implements Editable , KubernetesRes * No args constructor for use in serialization * */ - public MachinePool() { + public Region() { } - public MachinePool(String imageID, String instanceType, String systemDiskCategory, Integer systemDiskSize, List zones) { + public Region(String cOSRegion, String description, List sysTypes, String vPCRegion, List vPCZones, List zones) { super(); - this.imageID = imageID; - this.instanceType = instanceType; - this.systemDiskCategory = systemDiskCategory; - this.systemDiskSize = systemDiskSize; + this.cOSRegion = cOSRegion; + this.description = description; + this.sysTypes = sysTypes; + this.vPCRegion = vPCRegion; + this.vPCZones = vPCZones; this.zones = zones; } - @JsonProperty("imageID") - public String getImageID() { - return imageID; + @JsonProperty("COSRegion") + public String getCOSRegion() { + return cOSRegion; + } + + @JsonProperty("COSRegion") + public void setCOSRegion(String cOSRegion) { + this.cOSRegion = cOSRegion; } - @JsonProperty("imageID") - public void setImageID(String imageID) { - this.imageID = imageID; + @JsonProperty("Description") + public String getDescription() { + return description; } - @JsonProperty("instanceType") - public String getInstanceType() { - return instanceType; + @JsonProperty("Description") + public void setDescription(String description) { + this.description = description; } - @JsonProperty("instanceType") - public void setInstanceType(String instanceType) { - this.instanceType = instanceType; + @JsonProperty("SysTypes") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getSysTypes() { + return sysTypes; + } + + @JsonProperty("SysTypes") + public void setSysTypes(List sysTypes) { + this.sysTypes = sysTypes; } - @JsonProperty("systemDiskCategory") - public String getSystemDiskCategory() { - return systemDiskCategory; + @JsonProperty("VPCRegion") + public String getVPCRegion() { + return vPCRegion; } - @JsonProperty("systemDiskCategory") - public void setSystemDiskCategory(String systemDiskCategory) { - this.systemDiskCategory = systemDiskCategory; + @JsonProperty("VPCRegion") + public void setVPCRegion(String vPCRegion) { + this.vPCRegion = vPCRegion; } - @JsonProperty("systemDiskSize") - public Integer getSystemDiskSize() { - return systemDiskSize; + @JsonProperty("VPCZones") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getVPCZones() { + return vPCZones; } - @JsonProperty("systemDiskSize") - public void setSystemDiskSize(Integer systemDiskSize) { - this.systemDiskSize = systemDiskSize; + @JsonProperty("VPCZones") + public void setVPCZones(List vPCZones) { + this.vPCZones = vPCZones; } - @JsonProperty("zones") + @JsonProperty("Zones") @JsonInclude(JsonInclude.Include.NON_EMPTY) public List getZones() { return zones; } - @JsonProperty("zones") + @JsonProperty("Zones") public void setZones(List zones) { this.zones = zones; } @JsonIgnore - public MachinePoolBuilder edit() { - return new MachinePoolBuilder(this); + public RegionBuilder edit() { + return new RegionBuilder(this); } @JsonIgnore - public MachinePoolBuilder toBuilder() { + public RegionBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/ClusterMetadata.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/ClusterMetadata.java new file mode 100644 index 00000000000..356bd01c5f2 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/ClusterMetadata.java @@ -0,0 +1,306 @@ + +package io.fabric8.openshift.api.model.installer.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.fabric8.openshift.api.model.config.v1.CustomFeatureGates; +import io.fabric8.openshift.api.model.installer.aws.v1.Metadata; +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({ + "aws", + "azure", + "baremetal", + "clusterID", + "clusterName", + "customFeatureSet", + "featureSet", + "gcp", + "ibmcloud", + "infraID", + "nutanix", + "openstack", + "ovirt", + "powervs", + "vsphere" +}) +@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 ClusterMetadata implements Editable , KubernetesResource +{ + + @JsonProperty("aws") + private Metadata aws; + @JsonProperty("azure") + private io.fabric8.openshift.api.model.installer.azure.v1.Metadata azure; + @JsonProperty("baremetal") + private io.fabric8.openshift.api.model.installer.baremetal.v1.Metadata baremetal; + @JsonProperty("clusterID") + private String clusterID; + @JsonProperty("clusterName") + private String clusterName; + @JsonProperty("customFeatureSet") + private CustomFeatureGates customFeatureSet; + @JsonProperty("featureSet") + private String featureSet; + @JsonProperty("gcp") + private io.fabric8.openshift.api.model.installer.gcp.v1.Metadata gcp; + @JsonProperty("ibmcloud") + private io.fabric8.openshift.api.model.installer.ibmcloud.v1.Metadata ibmcloud; + @JsonProperty("infraID") + private String infraID; + @JsonProperty("nutanix") + private io.fabric8.openshift.api.model.installer.nutanix.v1.Metadata nutanix; + @JsonProperty("openstack") + private io.fabric8.openshift.api.model.installer.openstack.v1.Metadata openstack; + @JsonProperty("ovirt") + private io.fabric8.openshift.api.model.installer.ovirt.v1.Metadata ovirt; + @JsonProperty("powervs") + private io.fabric8.openshift.api.model.installer.powervs.v1.Metadata powervs; + @JsonProperty("vsphere") + private io.fabric8.openshift.api.model.installer.vsphere.v1.Metadata vsphere; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ClusterMetadata() { + } + + public ClusterMetadata(Metadata aws, io.fabric8.openshift.api.model.installer.azure.v1.Metadata azure, io.fabric8.openshift.api.model.installer.baremetal.v1.Metadata baremetal, String clusterID, String clusterName, CustomFeatureGates customFeatureSet, String featureSet, io.fabric8.openshift.api.model.installer.gcp.v1.Metadata gcp, io.fabric8.openshift.api.model.installer.ibmcloud.v1.Metadata ibmcloud, String infraID, io.fabric8.openshift.api.model.installer.nutanix.v1.Metadata nutanix, io.fabric8.openshift.api.model.installer.openstack.v1.Metadata openstack, io.fabric8.openshift.api.model.installer.ovirt.v1.Metadata ovirt, io.fabric8.openshift.api.model.installer.powervs.v1.Metadata powervs, io.fabric8.openshift.api.model.installer.vsphere.v1.Metadata vsphere) { + super(); + this.aws = aws; + this.azure = azure; + this.baremetal = baremetal; + this.clusterID = clusterID; + this.clusterName = clusterName; + this.customFeatureSet = customFeatureSet; + this.featureSet = featureSet; + this.gcp = gcp; + this.ibmcloud = ibmcloud; + this.infraID = infraID; + this.nutanix = nutanix; + this.openstack = openstack; + this.ovirt = ovirt; + this.powervs = powervs; + this.vsphere = vsphere; + } + + @JsonProperty("aws") + public Metadata getAws() { + return aws; + } + + @JsonProperty("aws") + public void setAws(Metadata aws) { + this.aws = aws; + } + + @JsonProperty("azure") + public io.fabric8.openshift.api.model.installer.azure.v1.Metadata getAzure() { + return azure; + } + + @JsonProperty("azure") + public void setAzure(io.fabric8.openshift.api.model.installer.azure.v1.Metadata azure) { + this.azure = azure; + } + + @JsonProperty("baremetal") + public io.fabric8.openshift.api.model.installer.baremetal.v1.Metadata getBaremetal() { + return baremetal; + } + + @JsonProperty("baremetal") + public void setBaremetal(io.fabric8.openshift.api.model.installer.baremetal.v1.Metadata baremetal) { + this.baremetal = baremetal; + } + + @JsonProperty("clusterID") + public String getClusterID() { + return clusterID; + } + + @JsonProperty("clusterID") + public void setClusterID(String clusterID) { + this.clusterID = clusterID; + } + + @JsonProperty("clusterName") + public String getClusterName() { + return clusterName; + } + + @JsonProperty("clusterName") + public void setClusterName(String clusterName) { + this.clusterName = clusterName; + } + + @JsonProperty("customFeatureSet") + public CustomFeatureGates getCustomFeatureSet() { + return customFeatureSet; + } + + @JsonProperty("customFeatureSet") + public void setCustomFeatureSet(CustomFeatureGates customFeatureSet) { + this.customFeatureSet = customFeatureSet; + } + + @JsonProperty("featureSet") + public String getFeatureSet() { + return featureSet; + } + + @JsonProperty("featureSet") + public void setFeatureSet(String featureSet) { + this.featureSet = featureSet; + } + + @JsonProperty("gcp") + public io.fabric8.openshift.api.model.installer.gcp.v1.Metadata getGcp() { + return gcp; + } + + @JsonProperty("gcp") + public void setGcp(io.fabric8.openshift.api.model.installer.gcp.v1.Metadata gcp) { + this.gcp = gcp; + } + + @JsonProperty("ibmcloud") + public io.fabric8.openshift.api.model.installer.ibmcloud.v1.Metadata getIbmcloud() { + return ibmcloud; + } + + @JsonProperty("ibmcloud") + public void setIbmcloud(io.fabric8.openshift.api.model.installer.ibmcloud.v1.Metadata ibmcloud) { + this.ibmcloud = ibmcloud; + } + + @JsonProperty("infraID") + public String getInfraID() { + return infraID; + } + + @JsonProperty("infraID") + public void setInfraID(String infraID) { + this.infraID = infraID; + } + + @JsonProperty("nutanix") + public io.fabric8.openshift.api.model.installer.nutanix.v1.Metadata getNutanix() { + return nutanix; + } + + @JsonProperty("nutanix") + public void setNutanix(io.fabric8.openshift.api.model.installer.nutanix.v1.Metadata nutanix) { + this.nutanix = nutanix; + } + + @JsonProperty("openstack") + public io.fabric8.openshift.api.model.installer.openstack.v1.Metadata getOpenstack() { + return openstack; + } + + @JsonProperty("openstack") + public void setOpenstack(io.fabric8.openshift.api.model.installer.openstack.v1.Metadata openstack) { + this.openstack = openstack; + } + + @JsonProperty("ovirt") + public io.fabric8.openshift.api.model.installer.ovirt.v1.Metadata getOvirt() { + return ovirt; + } + + @JsonProperty("ovirt") + public void setOvirt(io.fabric8.openshift.api.model.installer.ovirt.v1.Metadata ovirt) { + this.ovirt = ovirt; + } + + @JsonProperty("powervs") + public io.fabric8.openshift.api.model.installer.powervs.v1.Metadata getPowervs() { + return powervs; + } + + @JsonProperty("powervs") + public void setPowervs(io.fabric8.openshift.api.model.installer.powervs.v1.Metadata powervs) { + this.powervs = powervs; + } + + @JsonProperty("vsphere") + public io.fabric8.openshift.api.model.installer.vsphere.v1.Metadata getVsphere() { + return vsphere; + } + + @JsonProperty("vsphere") + public void setVsphere(io.fabric8.openshift.api.model.installer.vsphere.v1.Metadata vsphere) { + this.vsphere = vsphere; + } + + @JsonIgnore + public ClusterMetadataBuilder edit() { + return new ClusterMetadataBuilder(this); + } + + @JsonIgnore + public ClusterMetadataBuilder 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-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/ClusterNetworkEntry.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/ClusterNetworkEntry.java index 08fd8307a14..2b9a54c5b3b 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/ClusterNetworkEntry.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/ClusterNetworkEntry.java @@ -1,6 +1,7 @@ package io.fabric8.openshift.api.model.installer.v1; +import java.lang.String; import java.util.LinkedHashMap; import java.util.Map; import javax.annotation.Generated; diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/ClusterPlatformMetadata.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/ClusterPlatformMetadata.java new file mode 100644 index 00000000000..b95b9d9ef99 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/ClusterPlatformMetadata.java @@ -0,0 +1,235 @@ + +package io.fabric8.openshift.api.model.installer.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.fabric8.openshift.api.model.installer.aws.v1.Metadata; +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({ + "aws", + "azure", + "baremetal", + "gcp", + "ibmcloud", + "nutanix", + "openstack", + "ovirt", + "powervs", + "vsphere" +}) +@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 ClusterPlatformMetadata implements Editable , KubernetesResource +{ + + @JsonProperty("aws") + private Metadata aws; + @JsonProperty("azure") + private io.fabric8.openshift.api.model.installer.azure.v1.Metadata azure; + @JsonProperty("baremetal") + private io.fabric8.openshift.api.model.installer.baremetal.v1.Metadata baremetal; + @JsonProperty("gcp") + private io.fabric8.openshift.api.model.installer.gcp.v1.Metadata gcp; + @JsonProperty("ibmcloud") + private io.fabric8.openshift.api.model.installer.ibmcloud.v1.Metadata ibmcloud; + @JsonProperty("nutanix") + private io.fabric8.openshift.api.model.installer.nutanix.v1.Metadata nutanix; + @JsonProperty("openstack") + private io.fabric8.openshift.api.model.installer.openstack.v1.Metadata openstack; + @JsonProperty("ovirt") + private io.fabric8.openshift.api.model.installer.ovirt.v1.Metadata ovirt; + @JsonProperty("powervs") + private io.fabric8.openshift.api.model.installer.powervs.v1.Metadata powervs; + @JsonProperty("vsphere") + private io.fabric8.openshift.api.model.installer.vsphere.v1.Metadata vsphere; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ClusterPlatformMetadata() { + } + + public ClusterPlatformMetadata(Metadata aws, io.fabric8.openshift.api.model.installer.azure.v1.Metadata azure, io.fabric8.openshift.api.model.installer.baremetal.v1.Metadata baremetal, io.fabric8.openshift.api.model.installer.gcp.v1.Metadata gcp, io.fabric8.openshift.api.model.installer.ibmcloud.v1.Metadata ibmcloud, io.fabric8.openshift.api.model.installer.nutanix.v1.Metadata nutanix, io.fabric8.openshift.api.model.installer.openstack.v1.Metadata openstack, io.fabric8.openshift.api.model.installer.ovirt.v1.Metadata ovirt, io.fabric8.openshift.api.model.installer.powervs.v1.Metadata powervs, io.fabric8.openshift.api.model.installer.vsphere.v1.Metadata vsphere) { + super(); + this.aws = aws; + this.azure = azure; + this.baremetal = baremetal; + this.gcp = gcp; + this.ibmcloud = ibmcloud; + this.nutanix = nutanix; + this.openstack = openstack; + this.ovirt = ovirt; + this.powervs = powervs; + this.vsphere = vsphere; + } + + @JsonProperty("aws") + public Metadata getAws() { + return aws; + } + + @JsonProperty("aws") + public void setAws(Metadata aws) { + this.aws = aws; + } + + @JsonProperty("azure") + public io.fabric8.openshift.api.model.installer.azure.v1.Metadata getAzure() { + return azure; + } + + @JsonProperty("azure") + public void setAzure(io.fabric8.openshift.api.model.installer.azure.v1.Metadata azure) { + this.azure = azure; + } + + @JsonProperty("baremetal") + public io.fabric8.openshift.api.model.installer.baremetal.v1.Metadata getBaremetal() { + return baremetal; + } + + @JsonProperty("baremetal") + public void setBaremetal(io.fabric8.openshift.api.model.installer.baremetal.v1.Metadata baremetal) { + this.baremetal = baremetal; + } + + @JsonProperty("gcp") + public io.fabric8.openshift.api.model.installer.gcp.v1.Metadata getGcp() { + return gcp; + } + + @JsonProperty("gcp") + public void setGcp(io.fabric8.openshift.api.model.installer.gcp.v1.Metadata gcp) { + this.gcp = gcp; + } + + @JsonProperty("ibmcloud") + public io.fabric8.openshift.api.model.installer.ibmcloud.v1.Metadata getIbmcloud() { + return ibmcloud; + } + + @JsonProperty("ibmcloud") + public void setIbmcloud(io.fabric8.openshift.api.model.installer.ibmcloud.v1.Metadata ibmcloud) { + this.ibmcloud = ibmcloud; + } + + @JsonProperty("nutanix") + public io.fabric8.openshift.api.model.installer.nutanix.v1.Metadata getNutanix() { + return nutanix; + } + + @JsonProperty("nutanix") + public void setNutanix(io.fabric8.openshift.api.model.installer.nutanix.v1.Metadata nutanix) { + this.nutanix = nutanix; + } + + @JsonProperty("openstack") + public io.fabric8.openshift.api.model.installer.openstack.v1.Metadata getOpenstack() { + return openstack; + } + + @JsonProperty("openstack") + public void setOpenstack(io.fabric8.openshift.api.model.installer.openstack.v1.Metadata openstack) { + this.openstack = openstack; + } + + @JsonProperty("ovirt") + public io.fabric8.openshift.api.model.installer.ovirt.v1.Metadata getOvirt() { + return ovirt; + } + + @JsonProperty("ovirt") + public void setOvirt(io.fabric8.openshift.api.model.installer.ovirt.v1.Metadata ovirt) { + this.ovirt = ovirt; + } + + @JsonProperty("powervs") + public io.fabric8.openshift.api.model.installer.powervs.v1.Metadata getPowervs() { + return powervs; + } + + @JsonProperty("powervs") + public void setPowervs(io.fabric8.openshift.api.model.installer.powervs.v1.Metadata powervs) { + this.powervs = powervs; + } + + @JsonProperty("vsphere") + public io.fabric8.openshift.api.model.installer.vsphere.v1.Metadata getVsphere() { + return vsphere; + } + + @JsonProperty("vsphere") + public void setVsphere(io.fabric8.openshift.api.model.installer.vsphere.v1.Metadata vsphere) { + this.vsphere = vsphere; + } + + @JsonIgnore + public ClusterPlatformMetadataBuilder edit() { + return new ClusterPlatformMetadataBuilder(this); + } + + @JsonIgnore + public ClusterPlatformMetadataBuilder 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-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/ClusterQuota.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/ClusterQuota.java new file mode 100644 index 00000000000..86dba51cde5 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/ClusterQuota.java @@ -0,0 +1,113 @@ + +package io.fabric8.openshift.api.model.installer.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.fabric8.openshift.api.model.installer.gcp.v1.QuotaUsage; +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({ + "gcp" +}) +@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 ClusterQuota implements Editable , KubernetesResource +{ + + @JsonProperty("gcp") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List gcp = new ArrayList<>(); + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ClusterQuota() { + } + + public ClusterQuota(List gcp) { + super(); + this.gcp = gcp; + } + + @JsonProperty("gcp") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getGcp() { + return gcp; + } + + @JsonProperty("gcp") + public void setGcp(List gcp) { + this.gcp = gcp; + } + + @JsonIgnore + public ClusterQuotaBuilder edit() { + return new ClusterQuotaBuilder(this); + } + + @JsonIgnore + public ClusterQuotaBuilder 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-installer/src/generated/java/io/fabric8/openshift/api/model/installer/libvirt/v1/Network.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/ImageDigestSource.java similarity index 74% rename from kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/libvirt/v1/Network.java rename to kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/ImageDigestSource.java index 2062dbf8f20..68c660c4595 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/libvirt/v1/Network.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/ImageDigestSource.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.installer.libvirt.v1; +package io.fabric8.openshift.api.model.installer.v1; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -33,8 +33,8 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "dnsmasqOptions", - "if" + "mirrors", + "source" }) @ToString @EqualsAndHashCode @@ -54,14 +54,14 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class Network implements Editable , KubernetesResource +public class ImageDigestSource implements Editable , KubernetesResource { - @JsonProperty("dnsmasqOptions") + @JsonProperty("mirrors") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List dnsmasqOptions = new ArrayList<>(); - @JsonProperty("if") - private String _if; + private List mirrors = new ArrayList<>(); + @JsonProperty("source") + private String source; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -69,43 +69,43 @@ public class Network implements Editable , KubernetesResource * No args constructor for use in serialization * */ - public Network() { + public ImageDigestSource() { } - public Network(List dnsmasqOptions, String _if) { + public ImageDigestSource(List mirrors, String source) { super(); - this.dnsmasqOptions = dnsmasqOptions; - this._if = _if; + this.mirrors = mirrors; + this.source = source; } - @JsonProperty("dnsmasqOptions") + @JsonProperty("mirrors") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getDnsmasqOptions() { - return dnsmasqOptions; + public List getMirrors() { + return mirrors; } - @JsonProperty("dnsmasqOptions") - public void setDnsmasqOptions(List dnsmasqOptions) { - this.dnsmasqOptions = dnsmasqOptions; + @JsonProperty("mirrors") + public void setMirrors(List mirrors) { + this.mirrors = mirrors; } - @JsonProperty("if") - public String getIf() { - return _if; + @JsonProperty("source") + public String getSource() { + return source; } - @JsonProperty("if") - public void setIf(String _if) { - this._if = _if; + @JsonProperty("source") + public void setSource(String source) { + this.source = source; } @JsonIgnore - public NetworkBuilder edit() { - return new NetworkBuilder(this); + public ImageDigestSourceBuilder edit() { + return new ImageDigestSourceBuilder(this); } @JsonIgnore - public NetworkBuilder toBuilder() { + public ImageDigestSourceBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/InstallConfig.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/InstallConfig.java index 998975f4dac..38653d4f6e7 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/InstallConfig.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/InstallConfig.java @@ -20,6 +20,7 @@ import io.fabric8.kubernetes.api.model.LabelSelector; import io.fabric8.kubernetes.api.model.LocalObjectReference; import io.fabric8.kubernetes.api.model.Namespaced; +import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -49,10 +50,13 @@ "controlPlane", "cpuPartitioningMode", "credentialsMode", + "featureGates", "featureSet", "fips", "imageContentSources", + "imageDigestSources", "networking", + "operatorPublishingStrategy", "platform", "proxy", "publish", @@ -66,7 +70,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), @@ -111,6 +115,9 @@ public class InstallConfig implements Editable , HasMetada private String cpuPartitioningMode; @JsonProperty("credentialsMode") private String credentialsMode; + @JsonProperty("featureGates") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List featureGates = new ArrayList<>(); @JsonProperty("featureSet") private String featureSet; @JsonProperty("fips") @@ -118,6 +125,9 @@ public class InstallConfig implements Editable , HasMetada @JsonProperty("imageContentSources") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List imageContentSources = new ArrayList<>(); + @JsonProperty("imageDigestSources") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List imageDigestSources = new ArrayList<>(); /** * * (Required) @@ -126,9 +136,11 @@ public class InstallConfig implements Editable , HasMetada @JsonProperty("kind") private String kind = "InstallConfig"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("networking") private Networking networking; + @JsonProperty("operatorPublishingStrategy") + private OperatorPublishingStrategy operatorPublishingStrategy; @JsonProperty("platform") private Platform platform; @JsonProperty("proxy") @@ -149,7 +161,7 @@ public class InstallConfig implements Editable , HasMetada public InstallConfig() { } - public InstallConfig(String additionalTrustBundle, String additionalTrustBundlePolicy, String apiVersion, String baseDomain, BootstrapInPlace bootstrapInPlace, Capabilities capabilities, List compute, MachinePool controlPlane, String cpuPartitioningMode, String credentialsMode, String featureSet, Boolean fips, List imageContentSources, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, Networking networking, Platform platform, Proxy proxy, String publish, String pullSecret, String sshKey) { + public InstallConfig(String additionalTrustBundle, String additionalTrustBundlePolicy, String apiVersion, String baseDomain, BootstrapInPlace bootstrapInPlace, Capabilities capabilities, List compute, MachinePool controlPlane, String cpuPartitioningMode, String credentialsMode, List featureGates, String featureSet, Boolean fips, List imageContentSources, List imageDigestSources, String kind, ObjectMeta metadata, Networking networking, OperatorPublishingStrategy operatorPublishingStrategy, Platform platform, Proxy proxy, String publish, String pullSecret, String sshKey) { super(); this.additionalTrustBundle = additionalTrustBundle; this.additionalTrustBundlePolicy = additionalTrustBundlePolicy; @@ -161,12 +173,15 @@ public InstallConfig(String additionalTrustBundle, String additionalTrustBundleP this.controlPlane = controlPlane; this.cpuPartitioningMode = cpuPartitioningMode; this.credentialsMode = credentialsMode; + this.featureGates = featureGates; this.featureSet = featureSet; this.fips = fips; this.imageContentSources = imageContentSources; + this.imageDigestSources = imageDigestSources; this.kind = kind; this.metadata = metadata; this.networking = networking; + this.operatorPublishingStrategy = operatorPublishingStrategy; this.platform = platform; this.proxy = proxy; this.publish = publish; @@ -285,6 +300,17 @@ public void setCredentialsMode(String credentialsMode) { this.credentialsMode = credentialsMode; } + @JsonProperty("featureGates") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getFeatureGates() { + return featureGates; + } + + @JsonProperty("featureGates") + public void setFeatureGates(List featureGates) { + this.featureGates = featureGates; + } + @JsonProperty("featureSet") public String getFeatureSet() { return featureSet; @@ -316,6 +342,17 @@ public void setImageContentSources(List imageContentSources) this.imageContentSources = imageContentSources; } + @JsonProperty("imageDigestSources") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getImageDigestSources() { + return imageDigestSources; + } + + @JsonProperty("imageDigestSources") + public void setImageDigestSources(List imageDigestSources) { + this.imageDigestSources = imageDigestSources; + } + /** * * (Required) @@ -337,12 +374,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; } @@ -356,6 +393,16 @@ public void setNetworking(Networking networking) { this.networking = networking; } + @JsonProperty("operatorPublishingStrategy") + public OperatorPublishingStrategy getOperatorPublishingStrategy() { + return operatorPublishingStrategy; + } + + @JsonProperty("operatorPublishingStrategy") + public void setOperatorPublishingStrategy(OperatorPublishingStrategy operatorPublishingStrategy) { + this.operatorPublishingStrategy = operatorPublishingStrategy; + } + @JsonProperty("platform") public Platform getPlatform() { return platform; diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/MachineNetworkEntry.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/MachineNetworkEntry.java index cd7ab4ba5ae..9209a1090ca 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/MachineNetworkEntry.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/MachineNetworkEntry.java @@ -1,6 +1,7 @@ package io.fabric8.openshift.api.model.installer.v1; +import java.lang.String; import java.util.LinkedHashMap; import java.util.Map; import javax.annotation.Generated; diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/MachinePoolPlatform.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/MachinePoolPlatform.java index dc0eb69b4f0..0c47fa6de49 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/MachinePoolPlatform.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/MachinePoolPlatform.java @@ -22,6 +22,7 @@ import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.fabric8.openshift.api.model.installer.aws.v1.MachinePool; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; import lombok.EqualsAndHashCode; @@ -31,13 +32,11 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "alibabacloud", "aws", "azure", "baremetal", "gcp", "ibmcloud", - "libvirt", "nutanix", "openstack", "ovirt", @@ -65,10 +64,8 @@ public class MachinePoolPlatform implements Editable , KubernetesResource { - @JsonProperty("alibabacloud") - private io.fabric8.openshift.api.model.installer.alibabacloud.v1.MachinePool alibabacloud; @JsonProperty("aws") - private io.fabric8.openshift.api.model.installer.aws.v1.MachinePool aws; + private MachinePool aws; @JsonProperty("azure") private io.fabric8.openshift.api.model.installer.azure.v1.MachinePool azure; @JsonProperty("baremetal") @@ -77,8 +74,6 @@ public class MachinePoolPlatform implements Editable private io.fabric8.openshift.api.model.installer.gcp.v1.MachinePool gcp; @JsonProperty("ibmcloud") private io.fabric8.openshift.api.model.installer.ibmcloud.v1.MachinePool ibmcloud; - @JsonProperty("libvirt") - private io.fabric8.openshift.api.model.installer.libvirt.v1.MachinePool libvirt; @JsonProperty("nutanix") private io.fabric8.openshift.api.model.installer.nutanix.v1.MachinePool nutanix; @JsonProperty("openstack") @@ -99,15 +94,13 @@ public class MachinePoolPlatform implements Editable public MachinePoolPlatform() { } - public MachinePoolPlatform(io.fabric8.openshift.api.model.installer.alibabacloud.v1.MachinePool alibabacloud, io.fabric8.openshift.api.model.installer.aws.v1.MachinePool aws, io.fabric8.openshift.api.model.installer.azure.v1.MachinePool azure, io.fabric8.openshift.api.model.installer.baremetal.v1.MachinePool baremetal, io.fabric8.openshift.api.model.installer.gcp.v1.MachinePool gcp, io.fabric8.openshift.api.model.installer.ibmcloud.v1.MachinePool ibmcloud, io.fabric8.openshift.api.model.installer.libvirt.v1.MachinePool libvirt, io.fabric8.openshift.api.model.installer.nutanix.v1.MachinePool nutanix, io.fabric8.openshift.api.model.installer.openstack.v1.MachinePool openstack, io.fabric8.openshift.api.model.installer.ovirt.v1.MachinePool ovirt, io.fabric8.openshift.api.model.installer.powervs.v1.MachinePool powervs, io.fabric8.openshift.api.model.installer.vsphere.v1.MachinePool vsphere) { + public MachinePoolPlatform(MachinePool aws, io.fabric8.openshift.api.model.installer.azure.v1.MachinePool azure, io.fabric8.openshift.api.model.installer.baremetal.v1.MachinePool baremetal, io.fabric8.openshift.api.model.installer.gcp.v1.MachinePool gcp, io.fabric8.openshift.api.model.installer.ibmcloud.v1.MachinePool ibmcloud, io.fabric8.openshift.api.model.installer.nutanix.v1.MachinePool nutanix, io.fabric8.openshift.api.model.installer.openstack.v1.MachinePool openstack, io.fabric8.openshift.api.model.installer.ovirt.v1.MachinePool ovirt, io.fabric8.openshift.api.model.installer.powervs.v1.MachinePool powervs, io.fabric8.openshift.api.model.installer.vsphere.v1.MachinePool vsphere) { super(); - this.alibabacloud = alibabacloud; this.aws = aws; this.azure = azure; this.baremetal = baremetal; this.gcp = gcp; this.ibmcloud = ibmcloud; - this.libvirt = libvirt; this.nutanix = nutanix; this.openstack = openstack; this.ovirt = ovirt; @@ -115,23 +108,13 @@ public MachinePoolPlatform(io.fabric8.openshift.api.model.installer.alibabacloud this.vsphere = vsphere; } - @JsonProperty("alibabacloud") - public io.fabric8.openshift.api.model.installer.alibabacloud.v1.MachinePool getAlibabacloud() { - return alibabacloud; - } - - @JsonProperty("alibabacloud") - public void setAlibabacloud(io.fabric8.openshift.api.model.installer.alibabacloud.v1.MachinePool alibabacloud) { - this.alibabacloud = alibabacloud; - } - @JsonProperty("aws") - public io.fabric8.openshift.api.model.installer.aws.v1.MachinePool getAws() { + public MachinePool getAws() { return aws; } @JsonProperty("aws") - public void setAws(io.fabric8.openshift.api.model.installer.aws.v1.MachinePool aws) { + public void setAws(MachinePool aws) { this.aws = aws; } @@ -175,16 +158,6 @@ public void setIbmcloud(io.fabric8.openshift.api.model.installer.ibmcloud.v1.Mac this.ibmcloud = ibmcloud; } - @JsonProperty("libvirt") - public io.fabric8.openshift.api.model.installer.libvirt.v1.MachinePool getLibvirt() { - return libvirt; - } - - @JsonProperty("libvirt") - public void setLibvirt(io.fabric8.openshift.api.model.installer.libvirt.v1.MachinePool libvirt) { - this.libvirt = libvirt; - } - @JsonProperty("nutanix") public io.fabric8.openshift.api.model.installer.nutanix.v1.MachinePool getNutanix() { return nutanix; diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/Networking.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/Networking.java index 8996836b4fb..9a813872e14 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/Networking.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/Networking.java @@ -1,6 +1,7 @@ package io.fabric8.openshift.api.model.installer.v1; +import java.lang.String; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; @@ -34,7 +35,8 @@ @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ "clusterNetwork", - "deprecatedClusterNetworks", + "clusterNetworkMTU", + "clusterNetworks", "machineCIDR", "machineNetwork", "networkType", @@ -66,9 +68,11 @@ public class Networking implements Editable , KubernetesResou @JsonProperty("clusterNetwork") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List clusterNetwork = new ArrayList<>(); - @JsonProperty("deprecatedClusterNetworks") + @JsonProperty("clusterNetworkMTU") + private Long clusterNetworkMTU; + @JsonProperty("clusterNetworks") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List deprecatedClusterNetworks = new ArrayList<>(); + private List clusterNetworkList = new ArrayList<>(); @JsonProperty("machineCIDR") private String machineCIDR; @JsonProperty("machineNetwork") @@ -93,10 +97,11 @@ public class Networking implements Editable , KubernetesResou public Networking() { } - public Networking(List clusterNetwork, List deprecatedClusterNetworks, String machineCIDR, List machineNetwork, String networkType, String serviceCIDR, List serviceNetwork, String type) { + public Networking(List clusterNetwork, Long clusterNetworkMTU, List clusterNetworkList, String machineCIDR, List machineNetwork, String networkType, String serviceCIDR, List serviceNetwork, String type) { super(); this.clusterNetwork = clusterNetwork; - this.deprecatedClusterNetworks = deprecatedClusterNetworks; + this.clusterNetworkMTU = clusterNetworkMTU; + this.clusterNetworkList = clusterNetworkList; this.machineCIDR = machineCIDR; this.machineNetwork = machineNetwork; this.networkType = networkType; @@ -116,15 +121,25 @@ public void setClusterNetwork(List clusterNetwork) { this.clusterNetwork = clusterNetwork; } - @JsonProperty("deprecatedClusterNetworks") + @JsonProperty("clusterNetworkMTU") + public Long getClusterNetworkMTU() { + return clusterNetworkMTU; + } + + @JsonProperty("clusterNetworkMTU") + public void setClusterNetworkMTU(Long clusterNetworkMTU) { + this.clusterNetworkMTU = clusterNetworkMTU; + } + + @JsonProperty("clusterNetworks") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getDeprecatedClusterNetworks() { - return deprecatedClusterNetworks; + public List getClusterNetworks() { + return clusterNetworkList; } - @JsonProperty("deprecatedClusterNetworks") - public void setDeprecatedClusterNetworks(List deprecatedClusterNetworks) { - this.deprecatedClusterNetworks = deprecatedClusterNetworks; + @JsonProperty("clusterNetworks") + public void setClusterNetworks(List clusterNetworkList) { + this.clusterNetworkList = clusterNetworkList; } @JsonProperty("machineCIDR") diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/OperatorPublishingStrategy.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/OperatorPublishingStrategy.java new file mode 100644 index 00000000000..4256ae8d374 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/OperatorPublishingStrategy.java @@ -0,0 +1,122 @@ + +package io.fabric8.openshift.api.model.installer.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({ + "apiserver", + "ingress" +}) +@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 OperatorPublishingStrategy implements Editable , KubernetesResource +{ + + @JsonProperty("apiserver") + private String apiserver; + @JsonProperty("ingress") + private String ingress; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public OperatorPublishingStrategy() { + } + + public OperatorPublishingStrategy(String apiserver, String ingress) { + super(); + this.apiserver = apiserver; + this.ingress = ingress; + } + + @JsonProperty("apiserver") + public String getApiserver() { + return apiserver; + } + + @JsonProperty("apiserver") + public void setApiserver(String apiserver) { + this.apiserver = apiserver; + } + + @JsonProperty("ingress") + public String getIngress() { + return ingress; + } + + @JsonProperty("ingress") + public void setIngress(String ingress) { + this.ingress = ingress; + } + + @JsonIgnore + public OperatorPublishingStrategyBuilder edit() { + return new OperatorPublishingStrategyBuilder(this); + } + + @JsonIgnore + public OperatorPublishingStrategyBuilder 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-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/Platform.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/Platform.java index ed9a471c0e3..46eacb533e4 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/Platform.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/Platform.java @@ -31,13 +31,12 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "alibabacloud", "aws", "azure", "baremetal", + "external", "gcp", "ibmcloud", - "libvirt", "none", "nutanix", "openstack", @@ -66,20 +65,18 @@ public class Platform implements Editable , KubernetesResource { - @JsonProperty("alibabacloud") - private io.fabric8.openshift.api.model.installer.alibabacloud.v1.Platform alibabacloud; @JsonProperty("aws") private io.fabric8.openshift.api.model.installer.aws.v1.Platform aws; @JsonProperty("azure") private io.fabric8.openshift.api.model.installer.azure.v1.Platform azure; @JsonProperty("baremetal") private io.fabric8.openshift.api.model.installer.baremetal.v1.Platform baremetal; + @JsonProperty("external") + private io.fabric8.openshift.api.model.installer.external.v1.Platform external; @JsonProperty("gcp") private io.fabric8.openshift.api.model.installer.gcp.v1.Platform gcp; @JsonProperty("ibmcloud") private io.fabric8.openshift.api.model.installer.ibmcloud.v1.Platform ibmcloud; - @JsonProperty("libvirt") - private io.fabric8.openshift.api.model.installer.libvirt.v1.Platform libvirt; @JsonProperty("none") private io.fabric8.openshift.api.model.installer.none.v1.Platform none; @JsonProperty("nutanix") @@ -102,15 +99,14 @@ public class Platform implements Editable , KubernetesResource public Platform() { } - public Platform(io.fabric8.openshift.api.model.installer.alibabacloud.v1.Platform alibabacloud, io.fabric8.openshift.api.model.installer.aws.v1.Platform aws, io.fabric8.openshift.api.model.installer.azure.v1.Platform azure, io.fabric8.openshift.api.model.installer.baremetal.v1.Platform baremetal, io.fabric8.openshift.api.model.installer.gcp.v1.Platform gcp, io.fabric8.openshift.api.model.installer.ibmcloud.v1.Platform ibmcloud, io.fabric8.openshift.api.model.installer.libvirt.v1.Platform libvirt, io.fabric8.openshift.api.model.installer.none.v1.Platform none, io.fabric8.openshift.api.model.installer.nutanix.v1.Platform nutanix, io.fabric8.openshift.api.model.installer.openstack.v1.Platform openstack, io.fabric8.openshift.api.model.installer.ovirt.v1.Platform ovirt, io.fabric8.openshift.api.model.installer.powervs.v1.Platform powervs, io.fabric8.openshift.api.model.installer.vsphere.v1.Platform vsphere) { + public Platform(io.fabric8.openshift.api.model.installer.aws.v1.Platform aws, io.fabric8.openshift.api.model.installer.azure.v1.Platform azure, io.fabric8.openshift.api.model.installer.baremetal.v1.Platform baremetal, io.fabric8.openshift.api.model.installer.external.v1.Platform external, io.fabric8.openshift.api.model.installer.gcp.v1.Platform gcp, io.fabric8.openshift.api.model.installer.ibmcloud.v1.Platform ibmcloud, io.fabric8.openshift.api.model.installer.none.v1.Platform none, io.fabric8.openshift.api.model.installer.nutanix.v1.Platform nutanix, io.fabric8.openshift.api.model.installer.openstack.v1.Platform openstack, io.fabric8.openshift.api.model.installer.ovirt.v1.Platform ovirt, io.fabric8.openshift.api.model.installer.powervs.v1.Platform powervs, io.fabric8.openshift.api.model.installer.vsphere.v1.Platform vsphere) { super(); - this.alibabacloud = alibabacloud; this.aws = aws; this.azure = azure; this.baremetal = baremetal; + this.external = external; this.gcp = gcp; this.ibmcloud = ibmcloud; - this.libvirt = libvirt; this.none = none; this.nutanix = nutanix; this.openstack = openstack; @@ -119,16 +115,6 @@ public Platform(io.fabric8.openshift.api.model.installer.alibabacloud.v1.Platfor this.vsphere = vsphere; } - @JsonProperty("alibabacloud") - public io.fabric8.openshift.api.model.installer.alibabacloud.v1.Platform getAlibabacloud() { - return alibabacloud; - } - - @JsonProperty("alibabacloud") - public void setAlibabacloud(io.fabric8.openshift.api.model.installer.alibabacloud.v1.Platform alibabacloud) { - this.alibabacloud = alibabacloud; - } - @JsonProperty("aws") public io.fabric8.openshift.api.model.installer.aws.v1.Platform getAws() { return aws; @@ -159,6 +145,16 @@ public void setBaremetal(io.fabric8.openshift.api.model.installer.baremetal.v1.P this.baremetal = baremetal; } + @JsonProperty("external") + public io.fabric8.openshift.api.model.installer.external.v1.Platform getExternal() { + return external; + } + + @JsonProperty("external") + public void setExternal(io.fabric8.openshift.api.model.installer.external.v1.Platform external) { + this.external = external; + } + @JsonProperty("gcp") public io.fabric8.openshift.api.model.installer.gcp.v1.Platform getGcp() { return gcp; @@ -179,16 +175,6 @@ public void setIbmcloud(io.fabric8.openshift.api.model.installer.ibmcloud.v1.Pla this.ibmcloud = ibmcloud; } - @JsonProperty("libvirt") - public io.fabric8.openshift.api.model.installer.libvirt.v1.Platform getLibvirt() { - return libvirt; - } - - @JsonProperty("libvirt") - public void setLibvirt(io.fabric8.openshift.api.model.installer.libvirt.v1.Platform libvirt) { - this.libvirt = libvirt; - } - @JsonProperty("none") public io.fabric8.openshift.api.model.installer.none.v1.Platform getNone() { return none; diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/vsphere/v1/Host.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/vsphere/v1/Host.java new file mode 100644 index 00000000000..0d845e9e1f5 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/vsphere/v1/Host.java @@ -0,0 +1,136 @@ + +package io.fabric8.openshift.api.model.installer.vsphere.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({ + "failureDomain", + "networkDevice", + "role" +}) +@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 Host implements Editable , KubernetesResource +{ + + @JsonProperty("failureDomain") + private String failureDomain; + @JsonProperty("networkDevice") + private NetworkDeviceSpec networkDevice; + @JsonProperty("role") + private String role; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public Host() { + } + + public Host(String failureDomain, NetworkDeviceSpec networkDevice, String role) { + super(); + this.failureDomain = failureDomain; + this.networkDevice = networkDevice; + this.role = role; + } + + @JsonProperty("failureDomain") + public String getFailureDomain() { + return failureDomain; + } + + @JsonProperty("failureDomain") + public void setFailureDomain(String failureDomain) { + this.failureDomain = failureDomain; + } + + @JsonProperty("networkDevice") + public NetworkDeviceSpec getNetworkDevice() { + return networkDevice; + } + + @JsonProperty("networkDevice") + public void setNetworkDevice(NetworkDeviceSpec networkDevice) { + this.networkDevice = networkDevice; + } + + @JsonProperty("role") + public String getRole() { + return role; + } + + @JsonProperty("role") + public void setRole(String role) { + this.role = role; + } + + @JsonIgnore + public HostBuilder edit() { + return new HostBuilder(this); + } + + @JsonIgnore + public HostBuilder 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-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/FailureDomain.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/vsphere/v1/Metadata.java similarity index 58% rename from kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/FailureDomain.java rename to kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/vsphere/v1/Metadata.java index 4b86f28e29b..58c8d9ffe52 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/FailureDomain.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/vsphere/v1/Metadata.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.installer.openstack.v1; +package io.fabric8.openshift.api.model.installer.vsphere.v1; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -33,9 +33,11 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "computeAvailabilityZone", - "portTargets", - "storageAvailabilityZone" + "VCenters", + "password", + "terraform_platform", + "username", + "vCenter" }) @ToString @EqualsAndHashCode @@ -55,16 +57,20 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class FailureDomain implements Editable , KubernetesResource +public class Metadata implements Editable , KubernetesResource { - @JsonProperty("computeAvailabilityZone") - private String computeAvailabilityZone; - @JsonProperty("portTargets") + @JsonProperty("VCenters") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List portTargets = new ArrayList<>(); - @JsonProperty("storageAvailabilityZone") - private String storageAvailabilityZone; + private List vCenters = new ArrayList<>(); + @JsonProperty("password") + private String password; + @JsonProperty("terraform_platform") + private String terraform_platform; + @JsonProperty("username") + private String username; + @JsonProperty("vCenter") + private String vCenter; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -72,54 +78,76 @@ public class FailureDomain implements Editable , Kubernete * No args constructor for use in serialization * */ - public FailureDomain() { + public Metadata() { } - public FailureDomain(String computeAvailabilityZone, List portTargets, String storageAvailabilityZone) { + public Metadata(List vCenters, String password, String terraform_platform, String username, String vCenter) { super(); - this.computeAvailabilityZone = computeAvailabilityZone; - this.portTargets = portTargets; - this.storageAvailabilityZone = storageAvailabilityZone; + this.vCenters = vCenters; + this.password = password; + this.terraform_platform = terraform_platform; + this.username = username; + this.vCenter = vCenter; } - @JsonProperty("computeAvailabilityZone") - public String getComputeAvailabilityZone() { - return computeAvailabilityZone; + @JsonProperty("VCenters") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getVCenters() { + return vCenters; } - @JsonProperty("computeAvailabilityZone") - public void setComputeAvailabilityZone(String computeAvailabilityZone) { - this.computeAvailabilityZone = computeAvailabilityZone; + @JsonProperty("VCenters") + public void setVCenters(List vCenters) { + this.vCenters = vCenters; } - @JsonProperty("portTargets") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getPortTargets() { - return portTargets; + @JsonProperty("password") + public String getPassword() { + return password; + } + + @JsonProperty("password") + public void setPassword(String password) { + this.password = password; + } + + @JsonProperty("terraform_platform") + public String getTerraform_platform() { + return terraform_platform; + } + + @JsonProperty("terraform_platform") + public void setTerraform_platform(String terraform_platform) { + this.terraform_platform = terraform_platform; + } + + @JsonProperty("username") + public String getUsername() { + return username; } - @JsonProperty("portTargets") - public void setPortTargets(List portTargets) { - this.portTargets = portTargets; + @JsonProperty("username") + public void setUsername(String username) { + this.username = username; } - @JsonProperty("storageAvailabilityZone") - public String getStorageAvailabilityZone() { - return storageAvailabilityZone; + @JsonProperty("vCenter") + public String getVCenter() { + return vCenter; } - @JsonProperty("storageAvailabilityZone") - public void setStorageAvailabilityZone(String storageAvailabilityZone) { - this.storageAvailabilityZone = storageAvailabilityZone; + @JsonProperty("vCenter") + public void setVCenter(String vCenter) { + this.vCenter = vCenter; } @JsonIgnore - public FailureDomainBuilder edit() { - return new FailureDomainBuilder(this); + public MetadataBuilder edit() { + return new MetadataBuilder(this); } @JsonIgnore - public FailureDomainBuilder toBuilder() { + public MetadataBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/vsphere/v1/NetworkDeviceSpec.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/vsphere/v1/NetworkDeviceSpec.java new file mode 100644 index 00000000000..ab2e9420ae7 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/vsphere/v1/NetworkDeviceSpec.java @@ -0,0 +1,142 @@ + +package io.fabric8.openshift.api.model.installer.vsphere.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({ + "gateway", + "ipAddrs", + "nameservers" +}) +@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 NetworkDeviceSpec implements Editable , KubernetesResource +{ + + @JsonProperty("gateway") + private String gateway; + @JsonProperty("ipAddrs") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List ipAddrs = new ArrayList<>(); + @JsonProperty("nameservers") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List nameservers = new ArrayList<>(); + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public NetworkDeviceSpec() { + } + + public NetworkDeviceSpec(String gateway, List ipAddrs, List nameservers) { + super(); + this.gateway = gateway; + this.ipAddrs = ipAddrs; + this.nameservers = nameservers; + } + + @JsonProperty("gateway") + public String getGateway() { + return gateway; + } + + @JsonProperty("gateway") + public void setGateway(String gateway) { + this.gateway = gateway; + } + + @JsonProperty("ipAddrs") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getIpAddrs() { + return ipAddrs; + } + + @JsonProperty("ipAddrs") + public void setIpAddrs(List ipAddrs) { + this.ipAddrs = ipAddrs; + } + + @JsonProperty("nameservers") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getNameservers() { + return nameservers; + } + + @JsonProperty("nameservers") + public void setNameservers(List nameservers) { + this.nameservers = nameservers; + } + + @JsonIgnore + public NetworkDeviceSpecBuilder edit() { + return new NetworkDeviceSpecBuilder(this); + } + + @JsonIgnore + public NetworkDeviceSpecBuilder 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-installer/src/generated/java/io/fabric8/openshift/api/model/installer/vsphere/v1/Platform.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/vsphere/v1/Platform.java index 135392e7e51..442446af719 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/vsphere/v1/Platform.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/vsphere/v1/Platform.java @@ -25,6 +25,7 @@ import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.openshift.api.model.config.v1.VSpherePlatformLoadBalancer; +import io.fabric8.openshift.api.model.config.v1.VSpherePlatformNodeNetworking; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; import lombok.EqualsAndHashCode; @@ -44,10 +45,12 @@ "diskType", "failureDomains", "folder", + "hosts", "ingressVIP", "ingressVIPs", "loadBalancer", "network", + "nodeNetworking", "password", "resourcePool", "username", @@ -97,6 +100,9 @@ public class Platform implements Editable , KubernetesResource private List failureDomains = new ArrayList<>(); @JsonProperty("folder") private String folder; + @JsonProperty("hosts") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List hosts = new ArrayList<>(); @JsonProperty("ingressVIP") private String ingressVIP; @JsonProperty("ingressVIPs") @@ -106,6 +112,8 @@ public class Platform implements Editable , KubernetesResource private VSpherePlatformLoadBalancer loadBalancer; @JsonProperty("network") private String network; + @JsonProperty("nodeNetworking") + private VSpherePlatformNodeNetworking nodeNetworking; @JsonProperty("password") private String password; @JsonProperty("resourcePool") @@ -127,7 +135,7 @@ public class Platform implements Editable , KubernetesResource public Platform() { } - public Platform(String apiVIP, List apiVIPs, String cluster, String clusterOSImage, String datacenter, String defaultDatastore, MachinePool defaultMachinePlatform, String diskType, List failureDomains, String folder, String ingressVIP, List ingressVIPs, VSpherePlatformLoadBalancer loadBalancer, String network, String password, String resourcePool, String username, String vCenter, List vcenters) { + public Platform(String apiVIP, List apiVIPs, String cluster, String clusterOSImage, String datacenter, String defaultDatastore, MachinePool defaultMachinePlatform, String diskType, List failureDomains, String folder, List hosts, String ingressVIP, List ingressVIPs, VSpherePlatformLoadBalancer loadBalancer, String network, VSpherePlatformNodeNetworking nodeNetworking, String password, String resourcePool, String username, String vCenter, List vcenters) { super(); this.apiVIP = apiVIP; this.apiVIPs = apiVIPs; @@ -139,10 +147,12 @@ public Platform(String apiVIP, List apiVIPs, String cluster, String clus this.diskType = diskType; this.failureDomains = failureDomains; this.folder = folder; + this.hosts = hosts; this.ingressVIP = ingressVIP; this.ingressVIPs = ingressVIPs; this.loadBalancer = loadBalancer; this.network = network; + this.nodeNetworking = nodeNetworking; this.password = password; this.resourcePool = resourcePool; this.username = username; @@ -252,6 +262,17 @@ public void setFolder(String folder) { this.folder = folder; } + @JsonProperty("hosts") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getHosts() { + return hosts; + } + + @JsonProperty("hosts") + public void setHosts(List hosts) { + this.hosts = hosts; + } + @JsonProperty("ingressVIP") public String getIngressVIP() { return ingressVIP; @@ -293,6 +314,16 @@ public void setNetwork(String network) { this.network = network; } + @JsonProperty("nodeNetworking") + public VSpherePlatformNodeNetworking getNodeNetworking() { + return nodeNetworking; + } + + @JsonProperty("nodeNetworking") + public void setNodeNetworking(VSpherePlatformNodeNetworking nodeNetworking) { + this.nodeNetworking = nodeNetworking; + } + @JsonProperty("password") public String getPassword() { return password; diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/vsphere/v1/Topology.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/vsphere/v1/Topology.java index 8e55077921b..6a2f241ee00 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/vsphere/v1/Topology.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/vsphere/v1/Topology.java @@ -38,7 +38,9 @@ "datastore", "folder", "networks", - "resourcePool" + "resourcePool", + "tagIDs", + "template" }) @ToString @EqualsAndHashCode @@ -74,6 +76,11 @@ public class Topology implements Editable , KubernetesResource private List networks = new ArrayList<>(); @JsonProperty("resourcePool") private String resourcePool; + @JsonProperty("tagIDs") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List tagIDs = new ArrayList<>(); + @JsonProperty("template") + private String template; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -84,7 +91,7 @@ public class Topology implements Editable , KubernetesResource public Topology() { } - public Topology(String computeCluster, String datacenter, String datastore, String folder, List networks, String resourcePool) { + public Topology(String computeCluster, String datacenter, String datastore, String folder, List networks, String resourcePool, List tagIDs, String template) { super(); this.computeCluster = computeCluster; this.datacenter = datacenter; @@ -92,6 +99,8 @@ public Topology(String computeCluster, String datacenter, String datastore, Stri this.folder = folder; this.networks = networks; this.resourcePool = resourcePool; + this.tagIDs = tagIDs; + this.template = template; } @JsonProperty("computeCluster") @@ -155,6 +164,27 @@ public void setResourcePool(String resourcePool) { this.resourcePool = resourcePool; } + @JsonProperty("tagIDs") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getTagIDs() { + return tagIDs; + } + + @JsonProperty("tagIDs") + public void setTagIDs(List tagIDs) { + this.tagIDs = tagIDs; + } + + @JsonProperty("template") + public String getTemplate() { + return template; + } + + @JsonProperty("template") + public void setTemplate(String template) { + this.template = template; + } + @JsonIgnore public TopologyBuilder edit() { return new TopologyBuilder(this); diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/vsphere/v1/VCenters.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/vsphere/v1/VCenters.java new file mode 100644 index 00000000000..3efc94d08b8 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/vsphere/v1/VCenters.java @@ -0,0 +1,136 @@ + +package io.fabric8.openshift.api.model.installer.vsphere.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({ + "password", + "username", + "vCenter" +}) +@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 VCenters implements Editable , KubernetesResource +{ + + @JsonProperty("password") + private String password; + @JsonProperty("username") + private String username; + @JsonProperty("vCenter") + private String vCenter; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public VCenters() { + } + + public VCenters(String password, String username, String vCenter) { + super(); + this.password = password; + this.username = username; + this.vCenter = vCenter; + } + + @JsonProperty("password") + public String getPassword() { + return password; + } + + @JsonProperty("password") + public void setPassword(String password) { + this.password = password; + } + + @JsonProperty("username") + public String getUsername() { + return username; + } + + @JsonProperty("username") + public void setUsername(String username) { + this.username = username; + } + + @JsonProperty("vCenter") + public String getVCenter() { + return vCenter; + } + + @JsonProperty("vCenter") + public void setVCenter(String vCenter) { + this.vCenter = vCenter; + } + + @JsonIgnore + public VCentersBuilder edit() { + return new VCentersBuilder(this); + } + + @JsonIgnore + public VCentersBuilder 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/pom.xml b/kubernetes-model-generator/pom.xml index d53f6eed40f..a229f9bcd13 100644 --- a/kubernetes-model-generator/pom.xml +++ b/kubernetes-model-generator/pom.xml @@ -172,6 +172,7 @@ io.fabric8.openshift.api.model.miscellaneous.cloudcredential io.fabric8.openshift.api.model.miscellaneous.helm io.fabric8.openshift.api.model + io.fabric8.openshift.api.model.installer io.fabric8.openshift.api.model.miscellaneous.network io.fabric8.openshift.api.model io.fabric8.openshift.api.model