From c405eb8d10a98d51532fe757d1a090a10dccf654 Mon Sep 17 00:00:00 2001 From: Marc Nuri Date: Thu, 25 Jul 2024 06:48:11 +0200 Subject: [PATCH] refactor: kubernetes-model-apps generated from OpenAPI schemas Signed-off-by: Marc Nuri --- Makefile | 1 + kubernetes-model-generator/generateModel.sh | 1 - .../kubernetes-model-apps/Makefile | 27 - .../cmd/generate/generate.go | 145 ---- .../kubernetes-model-apps/pom.xml | 34 +- .../kubernetes/api/model/KubeSchema.java | 726 ------------------ .../api/model/ValidationSchema.java | 726 ------------------ .../api/model/apps/ControllerRevision.java | 11 +- .../kubernetes/api/model/apps/DaemonSet.java | 11 +- .../api/model/apps/DaemonSetSpec.java | 20 +- .../kubernetes/api/model/apps/Deployment.java | 11 +- .../api/model/apps/DeploymentSpec.java | 20 +- .../kubernetes/api/model/apps/ReplicaSet.java | 11 +- .../api/model/apps/ReplicaSetSpec.java | 20 +- .../model/apps/RollingUpdateDaemonSet.java | 17 +- .../model/apps/RollingUpdateDeployment.java | 17 +- .../RollingUpdateStatefulSetStrategy.java | 11 +- .../api/model/apps/StatefulSet.java | 11 +- .../api/model/apps/StatefulSetSpec.java | 29 +- 19 files changed, 119 insertions(+), 1730 deletions(-) delete mode 100644 kubernetes-model-generator/kubernetes-model-apps/Makefile delete mode 100644 kubernetes-model-generator/kubernetes-model-apps/cmd/generate/generate.go delete mode 100644 kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java delete mode 100644 kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java diff --git a/Makefile b/Makefile index 2d15b3b1519..7a8a4cfa917 100644 --- a/Makefile +++ b/Makefile @@ -38,6 +38,7 @@ generate-openapi-classes: cd kubernetes-model-generator/kubernetes-model-rbac && mvn -Pgenerate clean install cd kubernetes-model-generator/kubernetes-model-admissionregistration && mvn -Pgenerate clean install cd kubernetes-model-generator/kubernetes-model-apiextensions && mvn -Pgenerate clean install + cd kubernetes-model-generator/kubernetes-model-apps && 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 5c4f58b0fda..a79dfcaab39 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=( - "kubernetes-model-apps" "kubernetes-model-autoscaling" "kubernetes-model-batch" "kubernetes-model-certificates" diff --git a/kubernetes-model-generator/kubernetes-model-apps/Makefile b/kubernetes-model-generator/kubernetes-model-apps/Makefile deleted file mode 100644 index c09a7003874..00000000000 --- a/kubernetes-model-generator/kubernetes-model-apps/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/kubernetes-model-apps/cmd/generate/generate.go b/kubernetes-model-generator/kubernetes-model-apps/cmd/generate/generate.go deleted file mode 100644 index da7d7a32177..00000000000 --- a/kubernetes-model-generator/kubernetes-model-apps/cmd/generate/generate.go +++ /dev/null @@ -1,145 +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" - // Dependencies of rbac - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/api/resource" - apimachineryversion "k8s.io/apimachinery/pkg/version" - kapi "k8s.io/api/core/v1" - - k8sappsapi "k8s.io/api/apps/v1" - - "log" - "reflect" - "strings" - "time" - - "os" - - "github.com/fabric8io/kubernetes-client/kubernetes-model-generator/pkg/schemagen" -) - -type Schema struct { - Info apimachineryversion.Info - APIGroup metav1.APIGroup - APIGroupList metav1.APIGroupList - BaseKubernetesList metav1.List - ObjectMeta metav1.ObjectMeta - TypeMeta metav1.TypeMeta - Status metav1.Status - Patch metav1.Patch - ListOptions metav1.ListOptions - DeleteOptions metav1.DeleteOptions - CreateOptions metav1.CreateOptions - UpdateOptions metav1.UpdateOptions - GetOptions metav1.GetOptions - PatchOptions metav1.PatchOptions - Time metav1.Time - RootPaths metav1.RootPaths - Quantity resource.Quantity - - Deployment k8sappsapi.Deployment - DeploymentList k8sappsapi.DeploymentList - StatefulSet k8sappsapi.StatefulSet - StatefulSetList k8sappsapi.StatefulSetList - DaemonSet k8sappsapi.DaemonSet - DaemonSetList k8sappsapi.DaemonSetList - ReplicaSet k8sappsapi.ReplicaSet - ReplicaSetList k8sappsapi.ReplicaSetList - ControllerRevision k8sappsapi.ControllerRevision - ControllerRevisionList k8sappsapi.ControllerRevisionList - - PodList kapi.PodList - PodTemplateList kapi.PodTemplateList - ReplicationControllerList kapi.ReplicationControllerList - ServiceList kapi.ServiceList - EndpointPort kapi.EndpointPort - Endpoints kapi.Endpoints - EndpointsList kapi.EndpointsList - Node kapi.Node - NodeList kapi.NodeList - EnvVar kapi.EnvVar - Namespace kapi.Namespace - NamespaceList kapi.NamespaceList - PersistentVolume kapi.PersistentVolume - PersistentVolumeList kapi.PersistentVolumeList - PersistentVolumeClaim kapi.PersistentVolumeClaim - PersistentVolumeClaimList kapi.PersistentVolumeClaimList - ResourceQuota kapi.ResourceQuota - ResourceQuotaList kapi.ResourceQuotaList - Secret kapi.Secret - SecretList kapi.SecretList - ServiceAccount kapi.ServiceAccount - ServiceAccountList kapi.ServiceAccountList - Binding kapi.Binding - LimitRangeList kapi.LimitRangeList - ComponentStatusList kapi.ComponentStatusList - ContainerStatus kapi.ContainerStatus - ConfigMap kapi.ConfigMap - ConfigMapList kapi.ConfigMapList - Toleration kapi.Toleration -} - -func main() { - packages := []schemagen.PackageDescriptor{ - {"k8s.io/apimachinery/pkg/util/intstr", "", "io.fabric8.kubernetes.api.model", "kubernetes_apimachinery_pkg_util_intstr_", false}, - {"k8s.io/apimachinery/pkg/runtime", "", "io.fabric8.kubernetes.api.model.runtime", "kubernetes_apimachinery_pkg_runtime_", false}, - {"k8s.io/apimachinery/pkg/version", "", "io.fabric8.kubernetes.api.model.version", "kubernetes_apimachinery_pkg_version_", false}, - {"k8s.io/apimachinery/pkg/apis/meta/v1", "", "io.fabric8.kubernetes.api.model", "kubernetes_apimachinery_", false}, - {"k8s.io/api/apps/v1", "", "io.fabric8.kubernetes.api.model.apps", "kubernetes_apps_", true}, - {"k8s.io/api/core/v1", "", "io.fabric8.kubernetes.api.model", "kubernetes_core_", false}, - {"k8s.io/kubernetes/pkg/watch/json", "", "io.fabric8.kubernetes.api.model", "kubernetes_watch_", false}, - {"k8s.io/kubernetes/pkg/util", "", "io.fabric8.kubernetes.api.model", "kubernetes_util_", false}, - {"k8s.io/kubernetes/pkg/api/errors", "", "io.fabric8.kubernetes.api.model", "kubernetes_errors_", false}, - {"k8s.io/client-go/tools/clientcmd/api/v1", "", "io.fabric8.kubernetes.api.model", "kubernetes_config_", false}, - {"k8s.io/kubernetes/pkg/api/unversioned", "", "io.fabric8.kubernetes.api.model", "api_", false}, - } - - typeMap := map[reflect.Type]reflect.Type{ - reflect.TypeOf(time.Time{}): reflect.TypeOf(""), - reflect.TypeOf(struct{}{}): reflect.TypeOf(""), - } - schema, err := schemagen.GenerateSchema(reflect.TypeOf(Schema{}), packages, typeMap, map[reflect.Type]string{},"apps") - if err != nil { - fmt.Fprintf(os.Stderr, "An error occurred: %v", err) - return - } - - args := os.Args[1:] - if len(args) < 1 || args[0] != "validation" { - schema.Resources = nil - } - - b, err := json.Marshal(&schema) - if err != nil { - log.Fatal(err) - } - result := string(b) - result = strings.Replace(result, "\"additionalProperty\":", "\"additionalProperties\":", -1) - - var out bytes.Buffer - err = json.Indent(&out, []byte(result), "", " ") - if err != nil { - log.Fatal(err) - } - - fmt.Println(out.String()) -} diff --git a/kubernetes-model-generator/kubernetes-model-apps/pom.xml b/kubernetes-model-generator/kubernetes-model-apps/pom.xml index 22376a3fc67..dca66b2ae1c 100644 --- a/kubernetes-model-generator/kubernetes-model-apps/pom.xml +++ b/kubernetes-model-generator/kubernetes-model-apps/pom.xml @@ -47,31 +47,27 @@ - - - - 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.kubernetes-latest} + + + io.fabric8.kubernetes.api.model.apps + + + ^io\.k8s\.api\.apps\..*$ + + + diff --git a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java deleted file mode 100644 index 3feec5bebbe..00000000000 --- a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ /dev/null @@ -1,726 +0,0 @@ - -package io.fabric8.kubernetes.api.model; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; -import io.fabric8.kubernetes.api.model.apps.ControllerRevision; -import io.fabric8.kubernetes.api.model.apps.ControllerRevisionList; -import io.fabric8.kubernetes.api.model.apps.DaemonSet; -import io.fabric8.kubernetes.api.model.apps.DaemonSetList; -import io.fabric8.kubernetes.api.model.apps.Deployment; -import io.fabric8.kubernetes.api.model.apps.DeploymentList; -import io.fabric8.kubernetes.api.model.apps.ReplicaSet; -import io.fabric8.kubernetes.api.model.apps.ReplicaSetList; -import io.fabric8.kubernetes.api.model.apps.StatefulSet; -import io.fabric8.kubernetes.api.model.apps.StatefulSetList; -import io.fabric8.kubernetes.api.model.version.Info; - -@Generated("jsonschema2pojo") -public class KubeSchema { - - private APIGroup aPIGroup; - private APIGroupList aPIGroupList; - private KubernetesList baseKubernetesList; - private Binding binding; - private ComponentStatusList componentStatusList; - private ConfigMap configMap; - private ConfigMapList configMapList; - private ContainerStatus containerStatus; - private ControllerRevision controllerRevision; - private ControllerRevisionList controllerRevisionList; - private CreateOptions createOptions; - private DaemonSet daemonSet; - private DaemonSetList daemonSetList; - private DeleteOptions deleteOptions; - private Deployment deployment; - private DeploymentList deploymentList; - private EndpointPort endpointPort; - private Endpoints endpoints; - private EndpointsList endpointsList; - private EnvVar envVar; - private GetOptions getOptions; - private Info info; - private LimitRangeList limitRangeList; - private ListOptions listOptions; - private Namespace namespace; - private NamespaceList namespaceList; - private Node node; - private NodeList nodeList; - private ObjectMeta objectMeta; - private Patch patch; - private PatchOptions patchOptions; - private PersistentVolume persistentVolume; - private PersistentVolumeClaim persistentVolumeClaim; - private PersistentVolumeClaimList persistentVolumeClaimList; - private PersistentVolumeList persistentVolumeList; - private PodList podList; - private PodTemplateList podTemplateList; - private Quantity quantity; - private ReplicaSet replicaSet; - private ReplicaSetList replicaSetList; - private ReplicationControllerList replicationControllerList; - private ResourceQuota resourceQuota; - private ResourceQuotaList resourceQuotaList; - private RootPaths rootPaths; - private Secret secret; - private SecretList secretList; - private ServiceAccount serviceAccount; - private ServiceAccountList serviceAccountList; - private ServiceList serviceList; - private StatefulSet statefulSet; - private StatefulSetList statefulSetList; - private Status status; - private String time; - private Toleration toleration; - private TypeMeta typeMeta; - private UpdateOptions updateOptions; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public KubeSchema() { - } - - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, Binding binding, ComponentStatusList componentStatusList, ConfigMap configMap, ConfigMapList configMapList, ContainerStatus containerStatus, ControllerRevision controllerRevision, ControllerRevisionList controllerRevisionList, CreateOptions createOptions, DaemonSet daemonSet, DaemonSetList daemonSetList, DeleteOptions deleteOptions, Deployment deployment, DeploymentList deploymentList, EndpointPort endpointPort, Endpoints endpoints, EndpointsList endpointsList, EnvVar envVar, GetOptions getOptions, Info info, LimitRangeList limitRangeList, ListOptions listOptions, Namespace namespace, NamespaceList namespaceList, Node node, NodeList nodeList, ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, PersistentVolume persistentVolume, PersistentVolumeClaim persistentVolumeClaim, PersistentVolumeClaimList persistentVolumeClaimList, PersistentVolumeList persistentVolumeList, PodList podList, PodTemplateList podTemplateList, Quantity quantity, ReplicaSet replicaSet, ReplicaSetList replicaSetList, ReplicationControllerList replicationControllerList, ResourceQuota resourceQuota, ResourceQuotaList resourceQuotaList, RootPaths rootPaths, Secret secret, SecretList secretList, ServiceAccount serviceAccount, ServiceAccountList serviceAccountList, ServiceList serviceList, StatefulSet statefulSet, StatefulSetList statefulSetList, Status status, String time, Toleration toleration, TypeMeta typeMeta, UpdateOptions updateOptions) { - super(); - this.aPIGroup = aPIGroup; - this.aPIGroupList = aPIGroupList; - this.baseKubernetesList = baseKubernetesList; - this.binding = binding; - this.componentStatusList = componentStatusList; - this.configMap = configMap; - this.configMapList = configMapList; - this.containerStatus = containerStatus; - this.controllerRevision = controllerRevision; - this.controllerRevisionList = controllerRevisionList; - this.createOptions = createOptions; - this.daemonSet = daemonSet; - this.daemonSetList = daemonSetList; - this.deleteOptions = deleteOptions; - this.deployment = deployment; - this.deploymentList = deploymentList; - this.endpointPort = endpointPort; - this.endpoints = endpoints; - this.endpointsList = endpointsList; - this.envVar = envVar; - this.getOptions = getOptions; - this.info = info; - this.limitRangeList = limitRangeList; - this.listOptions = listOptions; - this.namespace = namespace; - this.namespaceList = namespaceList; - this.node = node; - this.nodeList = nodeList; - this.objectMeta = objectMeta; - this.patch = patch; - this.patchOptions = patchOptions; - this.persistentVolume = persistentVolume; - this.persistentVolumeClaim = persistentVolumeClaim; - this.persistentVolumeClaimList = persistentVolumeClaimList; - this.persistentVolumeList = persistentVolumeList; - this.podList = podList; - this.podTemplateList = podTemplateList; - this.quantity = quantity; - this.replicaSet = replicaSet; - this.replicaSetList = replicaSetList; - this.replicationControllerList = replicationControllerList; - this.resourceQuota = resourceQuota; - this.resourceQuotaList = resourceQuotaList; - this.rootPaths = rootPaths; - this.secret = secret; - this.secretList = secretList; - this.serviceAccount = serviceAccount; - this.serviceAccountList = serviceAccountList; - this.serviceList = serviceList; - this.statefulSet = statefulSet; - this.statefulSetList = statefulSetList; - this.status = status; - this.time = time; - this.toleration = toleration; - this.typeMeta = typeMeta; - this.updateOptions = updateOptions; - } - - @JsonProperty("APIGroup") - public APIGroup getAPIGroup() { - return aPIGroup; - } - - @JsonProperty("APIGroup") - public void setAPIGroup(APIGroup aPIGroup) { - this.aPIGroup = aPIGroup; - } - - @JsonProperty("APIGroupList") - public APIGroupList getAPIGroupList() { - return aPIGroupList; - } - - @JsonProperty("APIGroupList") - public void setAPIGroupList(APIGroupList aPIGroupList) { - this.aPIGroupList = aPIGroupList; - } - - @JsonProperty("BaseKubernetesList") - public KubernetesList getBaseKubernetesList() { - return baseKubernetesList; - } - - @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(KubernetesList baseKubernetesList) { - this.baseKubernetesList = baseKubernetesList; - } - - @JsonProperty("Binding") - public Binding getBinding() { - return binding; - } - - @JsonProperty("Binding") - public void setBinding(Binding binding) { - this.binding = binding; - } - - @JsonProperty("ComponentStatusList") - public ComponentStatusList getComponentStatusList() { - return componentStatusList; - } - - @JsonProperty("ComponentStatusList") - public void setComponentStatusList(ComponentStatusList componentStatusList) { - this.componentStatusList = componentStatusList; - } - - @JsonProperty("ConfigMap") - public ConfigMap getConfigMap() { - return configMap; - } - - @JsonProperty("ConfigMap") - public void setConfigMap(ConfigMap configMap) { - this.configMap = configMap; - } - - @JsonProperty("ConfigMapList") - public ConfigMapList getConfigMapList() { - return configMapList; - } - - @JsonProperty("ConfigMapList") - public void setConfigMapList(ConfigMapList configMapList) { - this.configMapList = configMapList; - } - - @JsonProperty("ContainerStatus") - public ContainerStatus getContainerStatus() { - return containerStatus; - } - - @JsonProperty("ContainerStatus") - public void setContainerStatus(ContainerStatus containerStatus) { - this.containerStatus = containerStatus; - } - - @JsonProperty("ControllerRevision") - public ControllerRevision getControllerRevision() { - return controllerRevision; - } - - @JsonProperty("ControllerRevision") - public void setControllerRevision(ControllerRevision controllerRevision) { - this.controllerRevision = controllerRevision; - } - - @JsonProperty("ControllerRevisionList") - public ControllerRevisionList getControllerRevisionList() { - return controllerRevisionList; - } - - @JsonProperty("ControllerRevisionList") - public void setControllerRevisionList(ControllerRevisionList controllerRevisionList) { - this.controllerRevisionList = controllerRevisionList; - } - - @JsonProperty("CreateOptions") - public CreateOptions getCreateOptions() { - return createOptions; - } - - @JsonProperty("CreateOptions") - public void setCreateOptions(CreateOptions createOptions) { - this.createOptions = createOptions; - } - - @JsonProperty("DaemonSet") - public DaemonSet getDaemonSet() { - return daemonSet; - } - - @JsonProperty("DaemonSet") - public void setDaemonSet(DaemonSet daemonSet) { - this.daemonSet = daemonSet; - } - - @JsonProperty("DaemonSetList") - public DaemonSetList getDaemonSetList() { - return daemonSetList; - } - - @JsonProperty("DaemonSetList") - public void setDaemonSetList(DaemonSetList daemonSetList) { - this.daemonSetList = daemonSetList; - } - - @JsonProperty("DeleteOptions") - public DeleteOptions getDeleteOptions() { - return deleteOptions; - } - - @JsonProperty("DeleteOptions") - public void setDeleteOptions(DeleteOptions deleteOptions) { - this.deleteOptions = deleteOptions; - } - - @JsonProperty("Deployment") - public Deployment getDeployment() { - return deployment; - } - - @JsonProperty("Deployment") - public void setDeployment(Deployment deployment) { - this.deployment = deployment; - } - - @JsonProperty("DeploymentList") - public DeploymentList getDeploymentList() { - return deploymentList; - } - - @JsonProperty("DeploymentList") - public void setDeploymentList(DeploymentList deploymentList) { - this.deploymentList = deploymentList; - } - - @JsonProperty("EndpointPort") - public EndpointPort getEndpointPort() { - return endpointPort; - } - - @JsonProperty("EndpointPort") - public void setEndpointPort(EndpointPort endpointPort) { - this.endpointPort = endpointPort; - } - - @JsonProperty("Endpoints") - public Endpoints getEndpoints() { - return endpoints; - } - - @JsonProperty("Endpoints") - public void setEndpoints(Endpoints endpoints) { - this.endpoints = endpoints; - } - - @JsonProperty("EndpointsList") - public EndpointsList getEndpointsList() { - return endpointsList; - } - - @JsonProperty("EndpointsList") - public void setEndpointsList(EndpointsList endpointsList) { - this.endpointsList = endpointsList; - } - - @JsonProperty("EnvVar") - public EnvVar getEnvVar() { - return envVar; - } - - @JsonProperty("EnvVar") - public void setEnvVar(EnvVar envVar) { - this.envVar = envVar; - } - - @JsonProperty("GetOptions") - public GetOptions getGetOptions() { - return getOptions; - } - - @JsonProperty("GetOptions") - public void setGetOptions(GetOptions getOptions) { - this.getOptions = getOptions; - } - - @JsonProperty("Info") - public Info getInfo() { - return info; - } - - @JsonProperty("Info") - public void setInfo(Info info) { - this.info = info; - } - - @JsonProperty("LimitRangeList") - public LimitRangeList getLimitRangeList() { - return limitRangeList; - } - - @JsonProperty("LimitRangeList") - public void setLimitRangeList(LimitRangeList limitRangeList) { - this.limitRangeList = limitRangeList; - } - - @JsonProperty("ListOptions") - public ListOptions getListOptions() { - return listOptions; - } - - @JsonProperty("ListOptions") - public void setListOptions(ListOptions listOptions) { - this.listOptions = listOptions; - } - - @JsonProperty("Namespace") - public Namespace getNamespace() { - return namespace; - } - - @JsonProperty("Namespace") - public void setNamespace(Namespace namespace) { - this.namespace = namespace; - } - - @JsonProperty("NamespaceList") - public NamespaceList getNamespaceList() { - return namespaceList; - } - - @JsonProperty("NamespaceList") - public void setNamespaceList(NamespaceList namespaceList) { - this.namespaceList = namespaceList; - } - - @JsonProperty("Node") - public Node getNode() { - return node; - } - - @JsonProperty("Node") - public void setNode(Node node) { - this.node = node; - } - - @JsonProperty("NodeList") - public NodeList getNodeList() { - return nodeList; - } - - @JsonProperty("NodeList") - public void setNodeList(NodeList nodeList) { - this.nodeList = nodeList; - } - - @JsonProperty("ObjectMeta") - public ObjectMeta getObjectMeta() { - return objectMeta; - } - - @JsonProperty("ObjectMeta") - public void setObjectMeta(ObjectMeta objectMeta) { - this.objectMeta = objectMeta; - } - - @JsonProperty("Patch") - public Patch getPatch() { - return patch; - } - - @JsonProperty("Patch") - public void setPatch(Patch patch) { - this.patch = patch; - } - - @JsonProperty("PatchOptions") - public PatchOptions getPatchOptions() { - return patchOptions; - } - - @JsonProperty("PatchOptions") - public void setPatchOptions(PatchOptions patchOptions) { - this.patchOptions = patchOptions; - } - - @JsonProperty("PersistentVolume") - public PersistentVolume getPersistentVolume() { - return persistentVolume; - } - - @JsonProperty("PersistentVolume") - public void setPersistentVolume(PersistentVolume persistentVolume) { - this.persistentVolume = persistentVolume; - } - - @JsonProperty("PersistentVolumeClaim") - public PersistentVolumeClaim getPersistentVolumeClaim() { - return persistentVolumeClaim; - } - - @JsonProperty("PersistentVolumeClaim") - public void setPersistentVolumeClaim(PersistentVolumeClaim persistentVolumeClaim) { - this.persistentVolumeClaim = persistentVolumeClaim; - } - - @JsonProperty("PersistentVolumeClaimList") - public PersistentVolumeClaimList getPersistentVolumeClaimList() { - return persistentVolumeClaimList; - } - - @JsonProperty("PersistentVolumeClaimList") - public void setPersistentVolumeClaimList(PersistentVolumeClaimList persistentVolumeClaimList) { - this.persistentVolumeClaimList = persistentVolumeClaimList; - } - - @JsonProperty("PersistentVolumeList") - public PersistentVolumeList getPersistentVolumeList() { - return persistentVolumeList; - } - - @JsonProperty("PersistentVolumeList") - public void setPersistentVolumeList(PersistentVolumeList persistentVolumeList) { - this.persistentVolumeList = persistentVolumeList; - } - - @JsonProperty("PodList") - public PodList getPodList() { - return podList; - } - - @JsonProperty("PodList") - public void setPodList(PodList podList) { - this.podList = podList; - } - - @JsonProperty("PodTemplateList") - public PodTemplateList getPodTemplateList() { - return podTemplateList; - } - - @JsonProperty("PodTemplateList") - public void setPodTemplateList(PodTemplateList podTemplateList) { - this.podTemplateList = podTemplateList; - } - - @JsonProperty("Quantity") - public Quantity getQuantity() { - return quantity; - } - - @JsonProperty("Quantity") - public void setQuantity(Quantity quantity) { - this.quantity = quantity; - } - - @JsonProperty("ReplicaSet") - public ReplicaSet getReplicaSet() { - return replicaSet; - } - - @JsonProperty("ReplicaSet") - public void setReplicaSet(ReplicaSet replicaSet) { - this.replicaSet = replicaSet; - } - - @JsonProperty("ReplicaSetList") - public ReplicaSetList getReplicaSetList() { - return replicaSetList; - } - - @JsonProperty("ReplicaSetList") - public void setReplicaSetList(ReplicaSetList replicaSetList) { - this.replicaSetList = replicaSetList; - } - - @JsonProperty("ReplicationControllerList") - public ReplicationControllerList getReplicationControllerList() { - return replicationControllerList; - } - - @JsonProperty("ReplicationControllerList") - public void setReplicationControllerList(ReplicationControllerList replicationControllerList) { - this.replicationControllerList = replicationControllerList; - } - - @JsonProperty("ResourceQuota") - public ResourceQuota getResourceQuota() { - return resourceQuota; - } - - @JsonProperty("ResourceQuota") - public void setResourceQuota(ResourceQuota resourceQuota) { - this.resourceQuota = resourceQuota; - } - - @JsonProperty("ResourceQuotaList") - public ResourceQuotaList getResourceQuotaList() { - return resourceQuotaList; - } - - @JsonProperty("ResourceQuotaList") - public void setResourceQuotaList(ResourceQuotaList resourceQuotaList) { - this.resourceQuotaList = resourceQuotaList; - } - - @JsonProperty("RootPaths") - public RootPaths getRootPaths() { - return rootPaths; - } - - @JsonProperty("RootPaths") - public void setRootPaths(RootPaths rootPaths) { - this.rootPaths = rootPaths; - } - - @JsonProperty("Secret") - public Secret getSecret() { - return secret; - } - - @JsonProperty("Secret") - public void setSecret(Secret secret) { - this.secret = secret; - } - - @JsonProperty("SecretList") - public SecretList getSecretList() { - return secretList; - } - - @JsonProperty("SecretList") - public void setSecretList(SecretList secretList) { - this.secretList = secretList; - } - - @JsonProperty("ServiceAccount") - public ServiceAccount getServiceAccount() { - return serviceAccount; - } - - @JsonProperty("ServiceAccount") - public void setServiceAccount(ServiceAccount serviceAccount) { - this.serviceAccount = serviceAccount; - } - - @JsonProperty("ServiceAccountList") - public ServiceAccountList getServiceAccountList() { - return serviceAccountList; - } - - @JsonProperty("ServiceAccountList") - public void setServiceAccountList(ServiceAccountList serviceAccountList) { - this.serviceAccountList = serviceAccountList; - } - - @JsonProperty("ServiceList") - public ServiceList getServiceList() { - return serviceList; - } - - @JsonProperty("ServiceList") - public void setServiceList(ServiceList serviceList) { - this.serviceList = serviceList; - } - - @JsonProperty("StatefulSet") - public StatefulSet getStatefulSet() { - return statefulSet; - } - - @JsonProperty("StatefulSet") - public void setStatefulSet(StatefulSet statefulSet) { - this.statefulSet = statefulSet; - } - - @JsonProperty("StatefulSetList") - public StatefulSetList getStatefulSetList() { - return statefulSetList; - } - - @JsonProperty("StatefulSetList") - public void setStatefulSetList(StatefulSetList statefulSetList) { - this.statefulSetList = statefulSetList; - } - - @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("Toleration") - public Toleration getToleration() { - return toleration; - } - - @JsonProperty("Toleration") - public void setToleration(Toleration toleration) { - this.toleration = toleration; - } - - @JsonProperty("TypeMeta") - public TypeMeta getTypeMeta() { - return typeMeta; - } - - @JsonProperty("TypeMeta") - public void setTypeMeta(TypeMeta typeMeta) { - this.typeMeta = typeMeta; - } - - @JsonProperty("UpdateOptions") - public UpdateOptions getUpdateOptions() { - return updateOptions; - } - - @JsonProperty("UpdateOptions") - public void setUpdateOptions(UpdateOptions updateOptions) { - this.updateOptions = updateOptions; - } - - @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/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java deleted file mode 100644 index 997e0847d8d..00000000000 --- a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ /dev/null @@ -1,726 +0,0 @@ - -package io.fabric8.kubernetes.api.model; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; -import io.fabric8.kubernetes.api.model.apps.ControllerRevision; -import io.fabric8.kubernetes.api.model.apps.ControllerRevisionList; -import io.fabric8.kubernetes.api.model.apps.DaemonSet; -import io.fabric8.kubernetes.api.model.apps.DaemonSetList; -import io.fabric8.kubernetes.api.model.apps.Deployment; -import io.fabric8.kubernetes.api.model.apps.DeploymentList; -import io.fabric8.kubernetes.api.model.apps.ReplicaSet; -import io.fabric8.kubernetes.api.model.apps.ReplicaSetList; -import io.fabric8.kubernetes.api.model.apps.StatefulSet; -import io.fabric8.kubernetes.api.model.apps.StatefulSetList; -import io.fabric8.kubernetes.api.model.version.Info; - -@Generated("jsonschema2pojo") -public class ValidationSchema { - - private APIGroup aPIGroup; - private APIGroupList aPIGroupList; - private KubernetesList baseKubernetesList; - private Binding binding; - private ComponentStatusList componentStatusList; - private ConfigMap configMap; - private ConfigMapList configMapList; - private ContainerStatus containerStatus; - private ControllerRevision controllerRevision; - private ControllerRevisionList controllerRevisionList; - private CreateOptions createOptions; - private DaemonSet daemonSet; - private DaemonSetList daemonSetList; - private DeleteOptions deleteOptions; - private Deployment deployment; - private DeploymentList deploymentList; - private EndpointPort endpointPort; - private Endpoints endpoints; - private EndpointsList endpointsList; - private EnvVar envVar; - private GetOptions getOptions; - private Info info; - private LimitRangeList limitRangeList; - private ListOptions listOptions; - private Namespace namespace; - private NamespaceList namespaceList; - private Node node; - private NodeList nodeList; - private ObjectMeta objectMeta; - private Patch patch; - private PatchOptions patchOptions; - private PersistentVolume persistentVolume; - private PersistentVolumeClaim persistentVolumeClaim; - private PersistentVolumeClaimList persistentVolumeClaimList; - private PersistentVolumeList persistentVolumeList; - private PodList podList; - private PodTemplateList podTemplateList; - private Quantity quantity; - private ReplicaSet replicaSet; - private ReplicaSetList replicaSetList; - private ReplicationControllerList replicationControllerList; - private ResourceQuota resourceQuota; - private ResourceQuotaList resourceQuotaList; - private RootPaths rootPaths; - private Secret secret; - private SecretList secretList; - private ServiceAccount serviceAccount; - private ServiceAccountList serviceAccountList; - private ServiceList serviceList; - private StatefulSet statefulSet; - private StatefulSetList statefulSetList; - private Status status; - private String time; - private Toleration toleration; - private TypeMeta typeMeta; - private UpdateOptions updateOptions; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ValidationSchema() { - } - - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, Binding binding, ComponentStatusList componentStatusList, ConfigMap configMap, ConfigMapList configMapList, ContainerStatus containerStatus, ControllerRevision controllerRevision, ControllerRevisionList controllerRevisionList, CreateOptions createOptions, DaemonSet daemonSet, DaemonSetList daemonSetList, DeleteOptions deleteOptions, Deployment deployment, DeploymentList deploymentList, EndpointPort endpointPort, Endpoints endpoints, EndpointsList endpointsList, EnvVar envVar, GetOptions getOptions, Info info, LimitRangeList limitRangeList, ListOptions listOptions, Namespace namespace, NamespaceList namespaceList, Node node, NodeList nodeList, ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, PersistentVolume persistentVolume, PersistentVolumeClaim persistentVolumeClaim, PersistentVolumeClaimList persistentVolumeClaimList, PersistentVolumeList persistentVolumeList, PodList podList, PodTemplateList podTemplateList, Quantity quantity, ReplicaSet replicaSet, ReplicaSetList replicaSetList, ReplicationControllerList replicationControllerList, ResourceQuota resourceQuota, ResourceQuotaList resourceQuotaList, RootPaths rootPaths, Secret secret, SecretList secretList, ServiceAccount serviceAccount, ServiceAccountList serviceAccountList, ServiceList serviceList, StatefulSet statefulSet, StatefulSetList statefulSetList, Status status, String time, Toleration toleration, TypeMeta typeMeta, UpdateOptions updateOptions) { - super(); - this.aPIGroup = aPIGroup; - this.aPIGroupList = aPIGroupList; - this.baseKubernetesList = baseKubernetesList; - this.binding = binding; - this.componentStatusList = componentStatusList; - this.configMap = configMap; - this.configMapList = configMapList; - this.containerStatus = containerStatus; - this.controllerRevision = controllerRevision; - this.controllerRevisionList = controllerRevisionList; - this.createOptions = createOptions; - this.daemonSet = daemonSet; - this.daemonSetList = daemonSetList; - this.deleteOptions = deleteOptions; - this.deployment = deployment; - this.deploymentList = deploymentList; - this.endpointPort = endpointPort; - this.endpoints = endpoints; - this.endpointsList = endpointsList; - this.envVar = envVar; - this.getOptions = getOptions; - this.info = info; - this.limitRangeList = limitRangeList; - this.listOptions = listOptions; - this.namespace = namespace; - this.namespaceList = namespaceList; - this.node = node; - this.nodeList = nodeList; - this.objectMeta = objectMeta; - this.patch = patch; - this.patchOptions = patchOptions; - this.persistentVolume = persistentVolume; - this.persistentVolumeClaim = persistentVolumeClaim; - this.persistentVolumeClaimList = persistentVolumeClaimList; - this.persistentVolumeList = persistentVolumeList; - this.podList = podList; - this.podTemplateList = podTemplateList; - this.quantity = quantity; - this.replicaSet = replicaSet; - this.replicaSetList = replicaSetList; - this.replicationControllerList = replicationControllerList; - this.resourceQuota = resourceQuota; - this.resourceQuotaList = resourceQuotaList; - this.rootPaths = rootPaths; - this.secret = secret; - this.secretList = secretList; - this.serviceAccount = serviceAccount; - this.serviceAccountList = serviceAccountList; - this.serviceList = serviceList; - this.statefulSet = statefulSet; - this.statefulSetList = statefulSetList; - this.status = status; - this.time = time; - this.toleration = toleration; - this.typeMeta = typeMeta; - this.updateOptions = updateOptions; - } - - @JsonProperty("APIGroup") - public APIGroup getAPIGroup() { - return aPIGroup; - } - - @JsonProperty("APIGroup") - public void setAPIGroup(APIGroup aPIGroup) { - this.aPIGroup = aPIGroup; - } - - @JsonProperty("APIGroupList") - public APIGroupList getAPIGroupList() { - return aPIGroupList; - } - - @JsonProperty("APIGroupList") - public void setAPIGroupList(APIGroupList aPIGroupList) { - this.aPIGroupList = aPIGroupList; - } - - @JsonProperty("BaseKubernetesList") - public KubernetesList getBaseKubernetesList() { - return baseKubernetesList; - } - - @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(KubernetesList baseKubernetesList) { - this.baseKubernetesList = baseKubernetesList; - } - - @JsonProperty("Binding") - public Binding getBinding() { - return binding; - } - - @JsonProperty("Binding") - public void setBinding(Binding binding) { - this.binding = binding; - } - - @JsonProperty("ComponentStatusList") - public ComponentStatusList getComponentStatusList() { - return componentStatusList; - } - - @JsonProperty("ComponentStatusList") - public void setComponentStatusList(ComponentStatusList componentStatusList) { - this.componentStatusList = componentStatusList; - } - - @JsonProperty("ConfigMap") - public ConfigMap getConfigMap() { - return configMap; - } - - @JsonProperty("ConfigMap") - public void setConfigMap(ConfigMap configMap) { - this.configMap = configMap; - } - - @JsonProperty("ConfigMapList") - public ConfigMapList getConfigMapList() { - return configMapList; - } - - @JsonProperty("ConfigMapList") - public void setConfigMapList(ConfigMapList configMapList) { - this.configMapList = configMapList; - } - - @JsonProperty("ContainerStatus") - public ContainerStatus getContainerStatus() { - return containerStatus; - } - - @JsonProperty("ContainerStatus") - public void setContainerStatus(ContainerStatus containerStatus) { - this.containerStatus = containerStatus; - } - - @JsonProperty("ControllerRevision") - public ControllerRevision getControllerRevision() { - return controllerRevision; - } - - @JsonProperty("ControllerRevision") - public void setControllerRevision(ControllerRevision controllerRevision) { - this.controllerRevision = controllerRevision; - } - - @JsonProperty("ControllerRevisionList") - public ControllerRevisionList getControllerRevisionList() { - return controllerRevisionList; - } - - @JsonProperty("ControllerRevisionList") - public void setControllerRevisionList(ControllerRevisionList controllerRevisionList) { - this.controllerRevisionList = controllerRevisionList; - } - - @JsonProperty("CreateOptions") - public CreateOptions getCreateOptions() { - return createOptions; - } - - @JsonProperty("CreateOptions") - public void setCreateOptions(CreateOptions createOptions) { - this.createOptions = createOptions; - } - - @JsonProperty("DaemonSet") - public DaemonSet getDaemonSet() { - return daemonSet; - } - - @JsonProperty("DaemonSet") - public void setDaemonSet(DaemonSet daemonSet) { - this.daemonSet = daemonSet; - } - - @JsonProperty("DaemonSetList") - public DaemonSetList getDaemonSetList() { - return daemonSetList; - } - - @JsonProperty("DaemonSetList") - public void setDaemonSetList(DaemonSetList daemonSetList) { - this.daemonSetList = daemonSetList; - } - - @JsonProperty("DeleteOptions") - public DeleteOptions getDeleteOptions() { - return deleteOptions; - } - - @JsonProperty("DeleteOptions") - public void setDeleteOptions(DeleteOptions deleteOptions) { - this.deleteOptions = deleteOptions; - } - - @JsonProperty("Deployment") - public Deployment getDeployment() { - return deployment; - } - - @JsonProperty("Deployment") - public void setDeployment(Deployment deployment) { - this.deployment = deployment; - } - - @JsonProperty("DeploymentList") - public DeploymentList getDeploymentList() { - return deploymentList; - } - - @JsonProperty("DeploymentList") - public void setDeploymentList(DeploymentList deploymentList) { - this.deploymentList = deploymentList; - } - - @JsonProperty("EndpointPort") - public EndpointPort getEndpointPort() { - return endpointPort; - } - - @JsonProperty("EndpointPort") - public void setEndpointPort(EndpointPort endpointPort) { - this.endpointPort = endpointPort; - } - - @JsonProperty("Endpoints") - public Endpoints getEndpoints() { - return endpoints; - } - - @JsonProperty("Endpoints") - public void setEndpoints(Endpoints endpoints) { - this.endpoints = endpoints; - } - - @JsonProperty("EndpointsList") - public EndpointsList getEndpointsList() { - return endpointsList; - } - - @JsonProperty("EndpointsList") - public void setEndpointsList(EndpointsList endpointsList) { - this.endpointsList = endpointsList; - } - - @JsonProperty("EnvVar") - public EnvVar getEnvVar() { - return envVar; - } - - @JsonProperty("EnvVar") - public void setEnvVar(EnvVar envVar) { - this.envVar = envVar; - } - - @JsonProperty("GetOptions") - public GetOptions getGetOptions() { - return getOptions; - } - - @JsonProperty("GetOptions") - public void setGetOptions(GetOptions getOptions) { - this.getOptions = getOptions; - } - - @JsonProperty("Info") - public Info getInfo() { - return info; - } - - @JsonProperty("Info") - public void setInfo(Info info) { - this.info = info; - } - - @JsonProperty("LimitRangeList") - public LimitRangeList getLimitRangeList() { - return limitRangeList; - } - - @JsonProperty("LimitRangeList") - public void setLimitRangeList(LimitRangeList limitRangeList) { - this.limitRangeList = limitRangeList; - } - - @JsonProperty("ListOptions") - public ListOptions getListOptions() { - return listOptions; - } - - @JsonProperty("ListOptions") - public void setListOptions(ListOptions listOptions) { - this.listOptions = listOptions; - } - - @JsonProperty("Namespace") - public Namespace getNamespace() { - return namespace; - } - - @JsonProperty("Namespace") - public void setNamespace(Namespace namespace) { - this.namespace = namespace; - } - - @JsonProperty("NamespaceList") - public NamespaceList getNamespaceList() { - return namespaceList; - } - - @JsonProperty("NamespaceList") - public void setNamespaceList(NamespaceList namespaceList) { - this.namespaceList = namespaceList; - } - - @JsonProperty("Node") - public Node getNode() { - return node; - } - - @JsonProperty("Node") - public void setNode(Node node) { - this.node = node; - } - - @JsonProperty("NodeList") - public NodeList getNodeList() { - return nodeList; - } - - @JsonProperty("NodeList") - public void setNodeList(NodeList nodeList) { - this.nodeList = nodeList; - } - - @JsonProperty("ObjectMeta") - public ObjectMeta getObjectMeta() { - return objectMeta; - } - - @JsonProperty("ObjectMeta") - public void setObjectMeta(ObjectMeta objectMeta) { - this.objectMeta = objectMeta; - } - - @JsonProperty("Patch") - public Patch getPatch() { - return patch; - } - - @JsonProperty("Patch") - public void setPatch(Patch patch) { - this.patch = patch; - } - - @JsonProperty("PatchOptions") - public PatchOptions getPatchOptions() { - return patchOptions; - } - - @JsonProperty("PatchOptions") - public void setPatchOptions(PatchOptions patchOptions) { - this.patchOptions = patchOptions; - } - - @JsonProperty("PersistentVolume") - public PersistentVolume getPersistentVolume() { - return persistentVolume; - } - - @JsonProperty("PersistentVolume") - public void setPersistentVolume(PersistentVolume persistentVolume) { - this.persistentVolume = persistentVolume; - } - - @JsonProperty("PersistentVolumeClaim") - public PersistentVolumeClaim getPersistentVolumeClaim() { - return persistentVolumeClaim; - } - - @JsonProperty("PersistentVolumeClaim") - public void setPersistentVolumeClaim(PersistentVolumeClaim persistentVolumeClaim) { - this.persistentVolumeClaim = persistentVolumeClaim; - } - - @JsonProperty("PersistentVolumeClaimList") - public PersistentVolumeClaimList getPersistentVolumeClaimList() { - return persistentVolumeClaimList; - } - - @JsonProperty("PersistentVolumeClaimList") - public void setPersistentVolumeClaimList(PersistentVolumeClaimList persistentVolumeClaimList) { - this.persistentVolumeClaimList = persistentVolumeClaimList; - } - - @JsonProperty("PersistentVolumeList") - public PersistentVolumeList getPersistentVolumeList() { - return persistentVolumeList; - } - - @JsonProperty("PersistentVolumeList") - public void setPersistentVolumeList(PersistentVolumeList persistentVolumeList) { - this.persistentVolumeList = persistentVolumeList; - } - - @JsonProperty("PodList") - public PodList getPodList() { - return podList; - } - - @JsonProperty("PodList") - public void setPodList(PodList podList) { - this.podList = podList; - } - - @JsonProperty("PodTemplateList") - public PodTemplateList getPodTemplateList() { - return podTemplateList; - } - - @JsonProperty("PodTemplateList") - public void setPodTemplateList(PodTemplateList podTemplateList) { - this.podTemplateList = podTemplateList; - } - - @JsonProperty("Quantity") - public Quantity getQuantity() { - return quantity; - } - - @JsonProperty("Quantity") - public void setQuantity(Quantity quantity) { - this.quantity = quantity; - } - - @JsonProperty("ReplicaSet") - public ReplicaSet getReplicaSet() { - return replicaSet; - } - - @JsonProperty("ReplicaSet") - public void setReplicaSet(ReplicaSet replicaSet) { - this.replicaSet = replicaSet; - } - - @JsonProperty("ReplicaSetList") - public ReplicaSetList getReplicaSetList() { - return replicaSetList; - } - - @JsonProperty("ReplicaSetList") - public void setReplicaSetList(ReplicaSetList replicaSetList) { - this.replicaSetList = replicaSetList; - } - - @JsonProperty("ReplicationControllerList") - public ReplicationControllerList getReplicationControllerList() { - return replicationControllerList; - } - - @JsonProperty("ReplicationControllerList") - public void setReplicationControllerList(ReplicationControllerList replicationControllerList) { - this.replicationControllerList = replicationControllerList; - } - - @JsonProperty("ResourceQuota") - public ResourceQuota getResourceQuota() { - return resourceQuota; - } - - @JsonProperty("ResourceQuota") - public void setResourceQuota(ResourceQuota resourceQuota) { - this.resourceQuota = resourceQuota; - } - - @JsonProperty("ResourceQuotaList") - public ResourceQuotaList getResourceQuotaList() { - return resourceQuotaList; - } - - @JsonProperty("ResourceQuotaList") - public void setResourceQuotaList(ResourceQuotaList resourceQuotaList) { - this.resourceQuotaList = resourceQuotaList; - } - - @JsonProperty("RootPaths") - public RootPaths getRootPaths() { - return rootPaths; - } - - @JsonProperty("RootPaths") - public void setRootPaths(RootPaths rootPaths) { - this.rootPaths = rootPaths; - } - - @JsonProperty("Secret") - public Secret getSecret() { - return secret; - } - - @JsonProperty("Secret") - public void setSecret(Secret secret) { - this.secret = secret; - } - - @JsonProperty("SecretList") - public SecretList getSecretList() { - return secretList; - } - - @JsonProperty("SecretList") - public void setSecretList(SecretList secretList) { - this.secretList = secretList; - } - - @JsonProperty("ServiceAccount") - public ServiceAccount getServiceAccount() { - return serviceAccount; - } - - @JsonProperty("ServiceAccount") - public void setServiceAccount(ServiceAccount serviceAccount) { - this.serviceAccount = serviceAccount; - } - - @JsonProperty("ServiceAccountList") - public ServiceAccountList getServiceAccountList() { - return serviceAccountList; - } - - @JsonProperty("ServiceAccountList") - public void setServiceAccountList(ServiceAccountList serviceAccountList) { - this.serviceAccountList = serviceAccountList; - } - - @JsonProperty("ServiceList") - public ServiceList getServiceList() { - return serviceList; - } - - @JsonProperty("ServiceList") - public void setServiceList(ServiceList serviceList) { - this.serviceList = serviceList; - } - - @JsonProperty("StatefulSet") - public StatefulSet getStatefulSet() { - return statefulSet; - } - - @JsonProperty("StatefulSet") - public void setStatefulSet(StatefulSet statefulSet) { - this.statefulSet = statefulSet; - } - - @JsonProperty("StatefulSetList") - public StatefulSetList getStatefulSetList() { - return statefulSetList; - } - - @JsonProperty("StatefulSetList") - public void setStatefulSetList(StatefulSetList statefulSetList) { - this.statefulSetList = statefulSetList; - } - - @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("Toleration") - public Toleration getToleration() { - return toleration; - } - - @JsonProperty("Toleration") - public void setToleration(Toleration toleration) { - this.toleration = toleration; - } - - @JsonProperty("TypeMeta") - public TypeMeta getTypeMeta() { - return typeMeta; - } - - @JsonProperty("TypeMeta") - public void setTypeMeta(TypeMeta typeMeta) { - this.typeMeta = typeMeta; - } - - @JsonProperty("UpdateOptions") - public UpdateOptions getUpdateOptions() { - return updateOptions; - } - - @JsonProperty("UpdateOptions") - public void setUpdateOptions(UpdateOptions updateOptions) { - this.updateOptions = updateOptions; - } - - @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/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/ControllerRevision.java b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/ControllerRevision.java index f38769230e2..d31071e5def 100644 --- a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/ControllerRevision.java +++ b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/ControllerRevision.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; @@ -51,7 +52,7 @@ "" }) @Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), + @BuildableReference(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @@ -89,7 +90,7 @@ public class ControllerRevision implements Editable , @JsonProperty("kind") private String kind = "ControllerRevision"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("revision") private Long revision; @JsonIgnore @@ -102,7 +103,7 @@ public class ControllerRevision implements Editable , public ControllerRevision() { } - public ControllerRevision(String apiVersion, KubernetesResource data, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, Long revision) { + public ControllerRevision(String apiVersion, KubernetesResource data, String kind, ObjectMeta metadata, Long revision) { super(); this.apiVersion = apiVersion; this.data = data; @@ -162,12 +163,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/DaemonSet.java b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/DaemonSet.java index f38005282d3..e55a5e22f34 100644 --- a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/DaemonSet.java +++ b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/DaemonSet.java @@ -18,6 +18,7 @@ import io.fabric8.kubernetes.api.model.LabelSelector; import io.fabric8.kubernetes.api.model.LocalObjectReference; import io.fabric8.kubernetes.api.model.Namespaced; +import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -48,7 +49,7 @@ "" }) @Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), + @BuildableReference(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @@ -82,7 +83,7 @@ public class DaemonSet implements Editable , HasMetadata, Name @JsonProperty("kind") private String kind = "DaemonSet"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("spec") private DaemonSetSpec spec; @JsonProperty("status") @@ -97,7 +98,7 @@ public class DaemonSet implements Editable , HasMetadata, Name public DaemonSet() { } - public DaemonSet(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, DaemonSetSpec spec, DaemonSetStatus status) { + public DaemonSet(String apiVersion, String kind, ObjectMeta metadata, DaemonSetSpec spec, DaemonSetStatus status) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -147,12 +148,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/DaemonSetSpec.java b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/DaemonSetSpec.java index f061c7adfe4..3a6f35ab803 100644 --- a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/DaemonSetSpec.java +++ b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/DaemonSetSpec.java @@ -15,10 +15,12 @@ import io.fabric8.kubernetes.api.model.Container; import io.fabric8.kubernetes.api.model.IntOrString; import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; import io.fabric8.kubernetes.api.model.LocalObjectReference; import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; @@ -43,9 +45,9 @@ }) @Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { @BuildableReference(ObjectMeta.class), - @BuildableReference(io.fabric8.kubernetes.api.model.LabelSelector.class), + @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), - @BuildableReference(io.fabric8.kubernetes.api.model.PodTemplateSpec.class), + @BuildableReference(PodTemplateSpec.class), @BuildableReference(ResourceRequirements.class), @BuildableReference(IntOrString.class), @BuildableReference(ObjectReference.class), @@ -61,9 +63,9 @@ public class DaemonSetSpec implements Editable , Kubernete @JsonProperty("revisionHistoryLimit") private Integer revisionHistoryLimit; @JsonProperty("selector") - private io.fabric8.kubernetes.api.model.LabelSelector selector; + private LabelSelector selector; @JsonProperty("template") - private io.fabric8.kubernetes.api.model.PodTemplateSpec template; + private PodTemplateSpec template; @JsonProperty("updateStrategy") private DaemonSetUpdateStrategy updateStrategy; @JsonIgnore @@ -76,7 +78,7 @@ public class DaemonSetSpec implements Editable , Kubernete public DaemonSetSpec() { } - public DaemonSetSpec(Integer minReadySeconds, Integer revisionHistoryLimit, io.fabric8.kubernetes.api.model.LabelSelector selector, io.fabric8.kubernetes.api.model.PodTemplateSpec template, DaemonSetUpdateStrategy updateStrategy) { + public DaemonSetSpec(Integer minReadySeconds, Integer revisionHistoryLimit, LabelSelector selector, PodTemplateSpec template, DaemonSetUpdateStrategy updateStrategy) { super(); this.minReadySeconds = minReadySeconds; this.revisionHistoryLimit = revisionHistoryLimit; @@ -106,22 +108,22 @@ public void setRevisionHistoryLimit(Integer revisionHistoryLimit) { } @JsonProperty("selector") - public io.fabric8.kubernetes.api.model.LabelSelector getSelector() { + public LabelSelector getSelector() { return selector; } @JsonProperty("selector") - public void setSelector(io.fabric8.kubernetes.api.model.LabelSelector selector) { + public void setSelector(LabelSelector selector) { this.selector = selector; } @JsonProperty("template") - public io.fabric8.kubernetes.api.model.PodTemplateSpec getTemplate() { + public PodTemplateSpec getTemplate() { return template; } @JsonProperty("template") - public void setTemplate(io.fabric8.kubernetes.api.model.PodTemplateSpec template) { + public void setTemplate(PodTemplateSpec template) { this.template = template; } diff --git a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/Deployment.java b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/Deployment.java index dd10e40f268..e7a938c36bb 100644 --- a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/Deployment.java +++ b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/Deployment.java @@ -18,6 +18,7 @@ import io.fabric8.kubernetes.api.model.LabelSelector; import io.fabric8.kubernetes.api.model.LocalObjectReference; import io.fabric8.kubernetes.api.model.Namespaced; +import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -48,7 +49,7 @@ "" }) @Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), + @BuildableReference(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @@ -82,7 +83,7 @@ public class Deployment implements Editable , HasMetadata, Na @JsonProperty("kind") private String kind = "Deployment"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("spec") private DeploymentSpec spec; @JsonProperty("status") @@ -97,7 +98,7 @@ public class Deployment implements Editable , HasMetadata, Na public Deployment() { } - public Deployment(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, DeploymentSpec spec, DeploymentStatus status) { + public Deployment(String apiVersion, String kind, ObjectMeta metadata, DeploymentSpec spec, DeploymentStatus status) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -147,12 +148,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/DeploymentSpec.java b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/DeploymentSpec.java index bf58e928106..ad537113146 100644 --- a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/DeploymentSpec.java +++ b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/DeploymentSpec.java @@ -15,10 +15,12 @@ import io.fabric8.kubernetes.api.model.Container; import io.fabric8.kubernetes.api.model.IntOrString; import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; import io.fabric8.kubernetes.api.model.LocalObjectReference; import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; @@ -46,9 +48,9 @@ }) @Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { @BuildableReference(ObjectMeta.class), - @BuildableReference(io.fabric8.kubernetes.api.model.LabelSelector.class), + @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), - @BuildableReference(io.fabric8.kubernetes.api.model.PodTemplateSpec.class), + @BuildableReference(PodTemplateSpec.class), @BuildableReference(ResourceRequirements.class), @BuildableReference(IntOrString.class), @BuildableReference(ObjectReference.class), @@ -70,11 +72,11 @@ public class DeploymentSpec implements Editable , Kuberne @JsonProperty("revisionHistoryLimit") private Integer revisionHistoryLimit; @JsonProperty("selector") - private io.fabric8.kubernetes.api.model.LabelSelector selector; + private LabelSelector selector; @JsonProperty("strategy") private DeploymentStrategy strategy; @JsonProperty("template") - private io.fabric8.kubernetes.api.model.PodTemplateSpec template; + private PodTemplateSpec template; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -85,7 +87,7 @@ public class DeploymentSpec implements Editable , Kuberne public DeploymentSpec() { } - public DeploymentSpec(Integer minReadySeconds, Boolean paused, Integer progressDeadlineSeconds, Integer replicas, Integer revisionHistoryLimit, io.fabric8.kubernetes.api.model.LabelSelector selector, DeploymentStrategy strategy, io.fabric8.kubernetes.api.model.PodTemplateSpec template) { + public DeploymentSpec(Integer minReadySeconds, Boolean paused, Integer progressDeadlineSeconds, Integer replicas, Integer revisionHistoryLimit, LabelSelector selector, DeploymentStrategy strategy, PodTemplateSpec template) { super(); this.minReadySeconds = minReadySeconds; this.paused = paused; @@ -148,12 +150,12 @@ public void setRevisionHistoryLimit(Integer revisionHistoryLimit) { } @JsonProperty("selector") - public io.fabric8.kubernetes.api.model.LabelSelector getSelector() { + public LabelSelector getSelector() { return selector; } @JsonProperty("selector") - public void setSelector(io.fabric8.kubernetes.api.model.LabelSelector selector) { + public void setSelector(LabelSelector selector) { this.selector = selector; } @@ -168,12 +170,12 @@ public void setStrategy(DeploymentStrategy strategy) { } @JsonProperty("template") - public io.fabric8.kubernetes.api.model.PodTemplateSpec getTemplate() { + public PodTemplateSpec getTemplate() { return template; } @JsonProperty("template") - public void setTemplate(io.fabric8.kubernetes.api.model.PodTemplateSpec template) { + public void setTemplate(PodTemplateSpec template) { this.template = template; } diff --git a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/ReplicaSet.java b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/ReplicaSet.java index fbdbcc5c565..f850f9c5df9 100644 --- a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/ReplicaSet.java +++ b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/ReplicaSet.java @@ -18,6 +18,7 @@ import io.fabric8.kubernetes.api.model.LabelSelector; import io.fabric8.kubernetes.api.model.LocalObjectReference; import io.fabric8.kubernetes.api.model.Namespaced; +import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -48,7 +49,7 @@ "" }) @Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), + @BuildableReference(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @@ -82,7 +83,7 @@ public class ReplicaSet implements Editable , HasMetadata, Na @JsonProperty("kind") private String kind = "ReplicaSet"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("spec") private ReplicaSetSpec spec; @JsonProperty("status") @@ -97,7 +98,7 @@ public class ReplicaSet implements Editable , HasMetadata, Na public ReplicaSet() { } - public ReplicaSet(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, ReplicaSetSpec spec, ReplicaSetStatus status) { + public ReplicaSet(String apiVersion, String kind, ObjectMeta metadata, ReplicaSetSpec spec, ReplicaSetStatus status) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -147,12 +148,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/ReplicaSetSpec.java b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/ReplicaSetSpec.java index 3484f59f49f..5d432e51514 100644 --- a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/ReplicaSetSpec.java +++ b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/ReplicaSetSpec.java @@ -15,10 +15,12 @@ import io.fabric8.kubernetes.api.model.Container; import io.fabric8.kubernetes.api.model.IntOrString; import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; import io.fabric8.kubernetes.api.model.LocalObjectReference; import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; @@ -42,9 +44,9 @@ }) @Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { @BuildableReference(ObjectMeta.class), - @BuildableReference(io.fabric8.kubernetes.api.model.LabelSelector.class), + @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), - @BuildableReference(io.fabric8.kubernetes.api.model.PodTemplateSpec.class), + @BuildableReference(PodTemplateSpec.class), @BuildableReference(ResourceRequirements.class), @BuildableReference(IntOrString.class), @BuildableReference(ObjectReference.class), @@ -60,9 +62,9 @@ public class ReplicaSetSpec implements Editable , Kuberne @JsonProperty("replicas") private Integer replicas; @JsonProperty("selector") - private io.fabric8.kubernetes.api.model.LabelSelector selector; + private LabelSelector selector; @JsonProperty("template") - private io.fabric8.kubernetes.api.model.PodTemplateSpec template; + private PodTemplateSpec template; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -73,7 +75,7 @@ public class ReplicaSetSpec implements Editable , Kuberne public ReplicaSetSpec() { } - public ReplicaSetSpec(Integer minReadySeconds, Integer replicas, io.fabric8.kubernetes.api.model.LabelSelector selector, io.fabric8.kubernetes.api.model.PodTemplateSpec template) { + public ReplicaSetSpec(Integer minReadySeconds, Integer replicas, LabelSelector selector, PodTemplateSpec template) { super(); this.minReadySeconds = minReadySeconds; this.replicas = replicas; @@ -102,22 +104,22 @@ public void setReplicas(Integer replicas) { } @JsonProperty("selector") - public io.fabric8.kubernetes.api.model.LabelSelector getSelector() { + public LabelSelector getSelector() { return selector; } @JsonProperty("selector") - public void setSelector(io.fabric8.kubernetes.api.model.LabelSelector selector) { + public void setSelector(LabelSelector selector) { this.selector = selector; } @JsonProperty("template") - public io.fabric8.kubernetes.api.model.PodTemplateSpec getTemplate() { + public PodTemplateSpec getTemplate() { return template; } @JsonProperty("template") - public void setTemplate(io.fabric8.kubernetes.api.model.PodTemplateSpec template) { + public void setTemplate(PodTemplateSpec template) { this.template = template; } diff --git a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/RollingUpdateDaemonSet.java b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/RollingUpdateDaemonSet.java index 6e176540fb2..e17260bf8db 100644 --- a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/RollingUpdateDaemonSet.java +++ b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/RollingUpdateDaemonSet.java @@ -13,6 +13,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.fabric8.kubernetes.api.builder.Editable; import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; import io.fabric8.kubernetes.api.model.KubernetesResource; import io.fabric8.kubernetes.api.model.LabelSelector; import io.fabric8.kubernetes.api.model.LocalObjectReference; @@ -45,7 +46,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) @@ -55,9 +56,9 @@ public class RollingUpdateDaemonSet implements Editable additionalProperties = new LinkedHashMap(); @@ -68,29 +69,29 @@ public class RollingUpdateDaemonSet implements Editable additionalProperties = new LinkedHashMap(); @@ -68,29 +69,29 @@ public class RollingUpdateDeployment implements Editable , HasMetadata, @JsonProperty("kind") private String kind = "StatefulSet"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("spec") private StatefulSetSpec spec; @JsonProperty("status") @@ -97,7 +98,7 @@ public class StatefulSet implements Editable , HasMetadata, public StatefulSet() { } - public StatefulSet(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, StatefulSetSpec spec, StatefulSetStatus status) { + public StatefulSet(String apiVersion, String kind, ObjectMeta metadata, StatefulSetSpec spec, StatefulSetStatus status) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -147,12 +148,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/StatefulSetSpec.java b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/StatefulSetSpec.java index 2eff5bb8a82..afc8767f25e 100644 --- a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/StatefulSetSpec.java +++ b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/StatefulSetSpec.java @@ -17,9 +17,12 @@ import io.fabric8.kubernetes.api.model.Container; import io.fabric8.kubernetes.api.model.IntOrString; import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; import io.fabric8.kubernetes.api.model.LocalObjectReference; import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; @@ -50,14 +53,14 @@ }) @Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { @BuildableReference(ObjectMeta.class), - @BuildableReference(io.fabric8.kubernetes.api.model.LabelSelector.class), + @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), - @BuildableReference(io.fabric8.kubernetes.api.model.PodTemplateSpec.class), + @BuildableReference(PodTemplateSpec.class), @BuildableReference(ResourceRequirements.class), @BuildableReference(IntOrString.class), @BuildableReference(ObjectReference.class), @BuildableReference(LocalObjectReference.class), - @BuildableReference(io.fabric8.kubernetes.api.model.PersistentVolumeClaim.class) + @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") public class StatefulSetSpec implements Editable , KubernetesResource @@ -76,16 +79,16 @@ public class StatefulSetSpec implements Editable , Kuber @JsonProperty("revisionHistoryLimit") private Integer revisionHistoryLimit; @JsonProperty("selector") - private io.fabric8.kubernetes.api.model.LabelSelector selector; + private LabelSelector selector; @JsonProperty("serviceName") private String serviceName; @JsonProperty("template") - private io.fabric8.kubernetes.api.model.PodTemplateSpec template; + private PodTemplateSpec template; @JsonProperty("updateStrategy") private StatefulSetUpdateStrategy updateStrategy; @JsonProperty("volumeClaimTemplates") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List volumeClaimTemplates = new ArrayList<>(); + private List volumeClaimTemplates = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -96,7 +99,7 @@ public class StatefulSetSpec implements Editable , Kuber public StatefulSetSpec() { } - public StatefulSetSpec(Integer minReadySeconds, StatefulSetOrdinals ordinals, StatefulSetPersistentVolumeClaimRetentionPolicy persistentVolumeClaimRetentionPolicy, String podManagementPolicy, Integer replicas, Integer revisionHistoryLimit, io.fabric8.kubernetes.api.model.LabelSelector selector, String serviceName, io.fabric8.kubernetes.api.model.PodTemplateSpec template, StatefulSetUpdateStrategy updateStrategy, List volumeClaimTemplates) { + public StatefulSetSpec(Integer minReadySeconds, StatefulSetOrdinals ordinals, StatefulSetPersistentVolumeClaimRetentionPolicy persistentVolumeClaimRetentionPolicy, String podManagementPolicy, Integer replicas, Integer revisionHistoryLimit, LabelSelector selector, String serviceName, PodTemplateSpec template, StatefulSetUpdateStrategy updateStrategy, List volumeClaimTemplates) { super(); this.minReadySeconds = minReadySeconds; this.ordinals = ordinals; @@ -172,12 +175,12 @@ public void setRevisionHistoryLimit(Integer revisionHistoryLimit) { } @JsonProperty("selector") - public io.fabric8.kubernetes.api.model.LabelSelector getSelector() { + public LabelSelector getSelector() { return selector; } @JsonProperty("selector") - public void setSelector(io.fabric8.kubernetes.api.model.LabelSelector selector) { + public void setSelector(LabelSelector selector) { this.selector = selector; } @@ -192,12 +195,12 @@ public void setServiceName(String serviceName) { } @JsonProperty("template") - public io.fabric8.kubernetes.api.model.PodTemplateSpec getTemplate() { + public PodTemplateSpec getTemplate() { return template; } @JsonProperty("template") - public void setTemplate(io.fabric8.kubernetes.api.model.PodTemplateSpec template) { + public void setTemplate(PodTemplateSpec template) { this.template = template; } @@ -213,12 +216,12 @@ public void setUpdateStrategy(StatefulSetUpdateStrategy updateStrategy) { @JsonProperty("volumeClaimTemplates") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getVolumeClaimTemplates() { + public List getVolumeClaimTemplates() { return volumeClaimTemplates; } @JsonProperty("volumeClaimTemplates") - public void setVolumeClaimTemplates(List volumeClaimTemplates) { + public void setVolumeClaimTemplates(List volumeClaimTemplates) { this.volumeClaimTemplates = volumeClaimTemplates; }