diff --git a/Makefile b/Makefile index 7c7c24e76ff..4b7aef1d028 100644 --- a/Makefile +++ b/Makefile @@ -48,6 +48,7 @@ generate-openapi-classes: cd kubernetes-model-generator/kubernetes-model-extensions && mvn -Pgenerate clean install cd kubernetes-model-generator/kubernetes-model-flowcontrol && mvn -Pgenerate clean install cd kubernetes-model-generator/kubernetes-model-gatewayapi && mvn -Pgenerate clean install + cd kubernetes-model-generator/kubernetes-model-networking && 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 699093e0864..214a9232b24 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-networking" "kubernetes-model-metrics" "kubernetes-model-node" "kubernetes-model-policy" diff --git a/kubernetes-model-generator/kubernetes-model-networking/Makefile b/kubernetes-model-generator/kubernetes-model-networking/Makefile deleted file mode 100644 index c09a7003874..00000000000 --- a/kubernetes-model-generator/kubernetes-model-networking/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-networking/cmd/generate/generate.go b/kubernetes-model-generator/kubernetes-model-networking/cmd/generate/generate.go deleted file mode 100644 index 65772a44c59..00000000000 --- a/kubernetes-model-generator/kubernetes-model-networking/cmd/generate/generate.go +++ /dev/null @@ -1,119 +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" - - networking "k8s.io/api/networking/v1" - networkingv1beta1 "k8s.io/api/networking/v1beta1" - networkingv1alpha1 "k8s.io/api/networking/v1alpha1" - - "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 - ObjectReference kapi.ObjectReference - - NetworkPolicy networking.NetworkPolicy - NetworkPolicyList networking.NetworkPolicyList - V1Ingress networking.Ingress - V1IngressList networking.IngressList - V1IngressClass networking.IngressClass - V1IngressClassList networking.IngressClassList - Ingress networkingv1beta1.Ingress - IngressList networkingv1beta1.IngressList - IngressClass networkingv1beta1.IngressClass - IngressClassList networkingv1beta1.IngressClassList - V1Alpha1IPAddress networkingv1alpha1.IPAddress - V1Alpha1IPAddressList networkingv1alpha1.IPAddressList - V1Alpha1ServiceCIDR networkingv1alpha1.ServiceCIDR - V1Alpha1ServiceCIDRList networkingv1alpha1.ServiceCIDRList -} - -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/core/v1", "", "io.fabric8.kubernetes.api.model", "kubernetes_core_", false}, - {"k8s.io/api/networking/v1", "networking.k8s.io", "io.fabric8.kubernetes.api.model.networking.v1", "kubernetes_networking_v1_", true}, - {"k8s.io/api/networking/v1beta1", "networking.k8s.io", "io.fabric8.kubernetes.api.model.networking.v1beta1", "kubernetes_networking_v1beta1_", true}, - {"k8s.io/api/networking/v1alpha1", "networking.k8s.io", "io.fabric8.kubernetes.api.model.networking.v1alpha1", "kubernetes_networking_v1alpha1_", true}, - } - - 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{},"networking") - 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-networking/pom.xml b/kubernetes-model-generator/kubernetes-model-networking/pom.xml index 19f3b5ade33..4119bc0da9a 100644 --- a/kubernetes-model-generator/kubernetes-model-networking/pom.xml +++ b/kubernetes-model-generator/kubernetes-model-networking/pom.xml @@ -41,10 +41,6 @@ io.fabric8 kubernetes-model-core - - io.fabric8 - kubernetes-model-common - org.assertj assertj-core @@ -52,31 +48,28 @@ - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifacts - - false - - - - - - - generate - org.jsonschema2pojo - jsonschema2pojo-maven-plugin + io.fabric8 + openapi-model-generator-maven-plugin + + + + ${project.basedir}/../openapi/schemas/kubernetes-1.21.14.json + ${openapi.schema.kubernetes-latest} + + + io.fabric8.kubernetes.api.model.networking + + + ^io\.k8s\.api\.networking\..*$ + + + diff --git a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java deleted file mode 100644 index 14a778be916..00000000000 --- a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ /dev/null @@ -1,434 +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.networking.v1.NetworkPolicy; -import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicyList; -import io.fabric8.kubernetes.api.model.networking.v1alpha1.IPAddress; -import io.fabric8.kubernetes.api.model.networking.v1alpha1.IPAddressList; -import io.fabric8.kubernetes.api.model.networking.v1alpha1.ServiceCIDR; -import io.fabric8.kubernetes.api.model.networking.v1alpha1.ServiceCIDRList; -import io.fabric8.kubernetes.api.model.version.Info; - -@Generated("jsonschema2pojo") -public class KubeSchema { - - private APIGroup aPIGroup; - private APIGroupList aPIGroupList; - private KubernetesList baseKubernetesList; - private CreateOptions createOptions; - private DeleteOptions deleteOptions; - private GetOptions getOptions; - private Info info; - private io.fabric8.kubernetes.api.model.networking.v1beta1.Ingress ingress; - private io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClass ingressClass; - private io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClassList ingressClassList; - private io.fabric8.kubernetes.api.model.networking.v1beta1.IngressList ingressList; - private ListOptions listOptions; - private NetworkPolicy networkPolicy; - private NetworkPolicyList networkPolicyList; - private ObjectMeta objectMeta; - private ObjectReference objectReference; - private Patch patch; - private PatchOptions patchOptions; - private Quantity quantity; - private RootPaths rootPaths; - private Status status; - private String time; - private TypeMeta typeMeta; - private UpdateOptions updateOptions; - private IPAddress v1Alpha1IPAddress; - private IPAddressList v1Alpha1IPAddressList; - private ServiceCIDR v1Alpha1ServiceCIDR; - private ServiceCIDRList v1Alpha1ServiceCIDRList; - private io.fabric8.kubernetes.api.model.networking.v1.Ingress v1Ingress; - private io.fabric8.kubernetes.api.model.networking.v1.IngressClass v1IngressClass; - private io.fabric8.kubernetes.api.model.networking.v1.IngressClassList v1IngressClassList; - private io.fabric8.kubernetes.api.model.networking.v1.IngressList v1IngressList; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public KubeSchema() { - } - - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, io.fabric8.kubernetes.api.model.networking.v1beta1.Ingress ingress, io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClass ingressClass, io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClassList ingressClassList, io.fabric8.kubernetes.api.model.networking.v1beta1.IngressList ingressList, ListOptions listOptions, NetworkPolicy networkPolicy, NetworkPolicyList networkPolicyList, ObjectMeta objectMeta, ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, IPAddress v1Alpha1IPAddress, IPAddressList v1Alpha1IPAddressList, ServiceCIDR v1Alpha1ServiceCIDR, ServiceCIDRList v1Alpha1ServiceCIDRList, io.fabric8.kubernetes.api.model.networking.v1.Ingress v1Ingress, io.fabric8.kubernetes.api.model.networking.v1.IngressClass v1IngressClass, io.fabric8.kubernetes.api.model.networking.v1.IngressClassList v1IngressClassList, io.fabric8.kubernetes.api.model.networking.v1.IngressList v1IngressList) { - super(); - this.aPIGroup = aPIGroup; - this.aPIGroupList = aPIGroupList; - this.baseKubernetesList = baseKubernetesList; - this.createOptions = createOptions; - this.deleteOptions = deleteOptions; - this.getOptions = getOptions; - this.info = info; - this.ingress = ingress; - this.ingressClass = ingressClass; - this.ingressClassList = ingressClassList; - this.ingressList = ingressList; - this.listOptions = listOptions; - this.networkPolicy = networkPolicy; - this.networkPolicyList = networkPolicyList; - this.objectMeta = objectMeta; - this.objectReference = objectReference; - this.patch = patch; - this.patchOptions = patchOptions; - this.quantity = quantity; - this.rootPaths = rootPaths; - this.status = status; - this.time = time; - this.typeMeta = typeMeta; - this.updateOptions = updateOptions; - this.v1Alpha1IPAddress = v1Alpha1IPAddress; - this.v1Alpha1IPAddressList = v1Alpha1IPAddressList; - this.v1Alpha1ServiceCIDR = v1Alpha1ServiceCIDR; - this.v1Alpha1ServiceCIDRList = v1Alpha1ServiceCIDRList; - this.v1Ingress = v1Ingress; - this.v1IngressClass = v1IngressClass; - this.v1IngressClassList = v1IngressClassList; - this.v1IngressList = v1IngressList; - } - - @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("CreateOptions") - public CreateOptions getCreateOptions() { - return createOptions; - } - - @JsonProperty("CreateOptions") - public void setCreateOptions(CreateOptions createOptions) { - this.createOptions = createOptions; - } - - @JsonProperty("DeleteOptions") - public DeleteOptions getDeleteOptions() { - return deleteOptions; - } - - @JsonProperty("DeleteOptions") - public void setDeleteOptions(DeleteOptions deleteOptions) { - this.deleteOptions = deleteOptions; - } - - @JsonProperty("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("Ingress") - public io.fabric8.kubernetes.api.model.networking.v1beta1.Ingress getIngress() { - return ingress; - } - - @JsonProperty("Ingress") - public void setIngress(io.fabric8.kubernetes.api.model.networking.v1beta1.Ingress ingress) { - this.ingress = ingress; - } - - @JsonProperty("IngressClass") - public io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClass getIngressClass() { - return ingressClass; - } - - @JsonProperty("IngressClass") - public void setIngressClass(io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClass ingressClass) { - this.ingressClass = ingressClass; - } - - @JsonProperty("IngressClassList") - public io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClassList getIngressClassList() { - return ingressClassList; - } - - @JsonProperty("IngressClassList") - public void setIngressClassList(io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClassList ingressClassList) { - this.ingressClassList = ingressClassList; - } - - @JsonProperty("IngressList") - public io.fabric8.kubernetes.api.model.networking.v1beta1.IngressList getIngressList() { - return ingressList; - } - - @JsonProperty("IngressList") - public void setIngressList(io.fabric8.kubernetes.api.model.networking.v1beta1.IngressList ingressList) { - this.ingressList = ingressList; - } - - @JsonProperty("ListOptions") - public ListOptions getListOptions() { - return listOptions; - } - - @JsonProperty("ListOptions") - public void setListOptions(ListOptions listOptions) { - this.listOptions = listOptions; - } - - @JsonProperty("NetworkPolicy") - public NetworkPolicy getNetworkPolicy() { - return networkPolicy; - } - - @JsonProperty("NetworkPolicy") - public void setNetworkPolicy(NetworkPolicy networkPolicy) { - this.networkPolicy = networkPolicy; - } - - @JsonProperty("NetworkPolicyList") - public NetworkPolicyList getNetworkPolicyList() { - return networkPolicyList; - } - - @JsonProperty("NetworkPolicyList") - public void setNetworkPolicyList(NetworkPolicyList networkPolicyList) { - this.networkPolicyList = networkPolicyList; - } - - @JsonProperty("ObjectMeta") - public ObjectMeta getObjectMeta() { - return objectMeta; - } - - @JsonProperty("ObjectMeta") - public void setObjectMeta(ObjectMeta objectMeta) { - this.objectMeta = objectMeta; - } - - @JsonProperty("ObjectReference") - public ObjectReference getObjectReference() { - return objectReference; - } - - @JsonProperty("ObjectReference") - public void setObjectReference(ObjectReference objectReference) { - this.objectReference = objectReference; - } - - @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("Quantity") - public Quantity getQuantity() { - return quantity; - } - - @JsonProperty("Quantity") - public void setQuantity(Quantity quantity) { - this.quantity = quantity; - } - - @JsonProperty("RootPaths") - public RootPaths getRootPaths() { - return rootPaths; - } - - @JsonProperty("RootPaths") - public void setRootPaths(RootPaths rootPaths) { - this.rootPaths = rootPaths; - } - - @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("UpdateOptions") - public UpdateOptions getUpdateOptions() { - return updateOptions; - } - - @JsonProperty("UpdateOptions") - public void setUpdateOptions(UpdateOptions updateOptions) { - this.updateOptions = updateOptions; - } - - @JsonProperty("V1Alpha1IPAddress") - public IPAddress getV1Alpha1IPAddress() { - return v1Alpha1IPAddress; - } - - @JsonProperty("V1Alpha1IPAddress") - public void setV1Alpha1IPAddress(IPAddress v1Alpha1IPAddress) { - this.v1Alpha1IPAddress = v1Alpha1IPAddress; - } - - @JsonProperty("V1Alpha1IPAddressList") - public IPAddressList getV1Alpha1IPAddressList() { - return v1Alpha1IPAddressList; - } - - @JsonProperty("V1Alpha1IPAddressList") - public void setV1Alpha1IPAddressList(IPAddressList v1Alpha1IPAddressList) { - this.v1Alpha1IPAddressList = v1Alpha1IPAddressList; - } - - @JsonProperty("V1Alpha1ServiceCIDR") - public ServiceCIDR getV1Alpha1ServiceCIDR() { - return v1Alpha1ServiceCIDR; - } - - @JsonProperty("V1Alpha1ServiceCIDR") - public void setV1Alpha1ServiceCIDR(ServiceCIDR v1Alpha1ServiceCIDR) { - this.v1Alpha1ServiceCIDR = v1Alpha1ServiceCIDR; - } - - @JsonProperty("V1Alpha1ServiceCIDRList") - public ServiceCIDRList getV1Alpha1ServiceCIDRList() { - return v1Alpha1ServiceCIDRList; - } - - @JsonProperty("V1Alpha1ServiceCIDRList") - public void setV1Alpha1ServiceCIDRList(ServiceCIDRList v1Alpha1ServiceCIDRList) { - this.v1Alpha1ServiceCIDRList = v1Alpha1ServiceCIDRList; - } - - @JsonProperty("V1Ingress") - public io.fabric8.kubernetes.api.model.networking.v1.Ingress getV1Ingress() { - return v1Ingress; - } - - @JsonProperty("V1Ingress") - public void setV1Ingress(io.fabric8.kubernetes.api.model.networking.v1.Ingress v1Ingress) { - this.v1Ingress = v1Ingress; - } - - @JsonProperty("V1IngressClass") - public io.fabric8.kubernetes.api.model.networking.v1.IngressClass getV1IngressClass() { - return v1IngressClass; - } - - @JsonProperty("V1IngressClass") - public void setV1IngressClass(io.fabric8.kubernetes.api.model.networking.v1.IngressClass v1IngressClass) { - this.v1IngressClass = v1IngressClass; - } - - @JsonProperty("V1IngressClassList") - public io.fabric8.kubernetes.api.model.networking.v1.IngressClassList getV1IngressClassList() { - return v1IngressClassList; - } - - @JsonProperty("V1IngressClassList") - public void setV1IngressClassList(io.fabric8.kubernetes.api.model.networking.v1.IngressClassList v1IngressClassList) { - this.v1IngressClassList = v1IngressClassList; - } - - @JsonProperty("V1IngressList") - public io.fabric8.kubernetes.api.model.networking.v1.IngressList getV1IngressList() { - return v1IngressList; - } - - @JsonProperty("V1IngressList") - public void setV1IngressList(io.fabric8.kubernetes.api.model.networking.v1.IngressList v1IngressList) { - this.v1IngressList = v1IngressList; - } - - @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-networking/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java deleted file mode 100644 index f734b5cb837..00000000000 --- a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ /dev/null @@ -1,434 +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.networking.v1.NetworkPolicy; -import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicyList; -import io.fabric8.kubernetes.api.model.networking.v1alpha1.IPAddress; -import io.fabric8.kubernetes.api.model.networking.v1alpha1.IPAddressList; -import io.fabric8.kubernetes.api.model.networking.v1alpha1.ServiceCIDR; -import io.fabric8.kubernetes.api.model.networking.v1alpha1.ServiceCIDRList; -import io.fabric8.kubernetes.api.model.version.Info; - -@Generated("jsonschema2pojo") -public class ValidationSchema { - - private APIGroup aPIGroup; - private APIGroupList aPIGroupList; - private KubernetesList baseKubernetesList; - private CreateOptions createOptions; - private DeleteOptions deleteOptions; - private GetOptions getOptions; - private Info info; - private io.fabric8.kubernetes.api.model.networking.v1beta1.Ingress ingress; - private io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClass ingressClass; - private io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClassList ingressClassList; - private io.fabric8.kubernetes.api.model.networking.v1beta1.IngressList ingressList; - private ListOptions listOptions; - private NetworkPolicy networkPolicy; - private NetworkPolicyList networkPolicyList; - private ObjectMeta objectMeta; - private ObjectReference objectReference; - private Patch patch; - private PatchOptions patchOptions; - private Quantity quantity; - private RootPaths rootPaths; - private Status status; - private String time; - private TypeMeta typeMeta; - private UpdateOptions updateOptions; - private IPAddress v1Alpha1IPAddress; - private IPAddressList v1Alpha1IPAddressList; - private ServiceCIDR v1Alpha1ServiceCIDR; - private ServiceCIDRList v1Alpha1ServiceCIDRList; - private io.fabric8.kubernetes.api.model.networking.v1.Ingress v1Ingress; - private io.fabric8.kubernetes.api.model.networking.v1.IngressClass v1IngressClass; - private io.fabric8.kubernetes.api.model.networking.v1.IngressClassList v1IngressClassList; - private io.fabric8.kubernetes.api.model.networking.v1.IngressList v1IngressList; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ValidationSchema() { - } - - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, io.fabric8.kubernetes.api.model.networking.v1beta1.Ingress ingress, io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClass ingressClass, io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClassList ingressClassList, io.fabric8.kubernetes.api.model.networking.v1beta1.IngressList ingressList, ListOptions listOptions, NetworkPolicy networkPolicy, NetworkPolicyList networkPolicyList, ObjectMeta objectMeta, ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, IPAddress v1Alpha1IPAddress, IPAddressList v1Alpha1IPAddressList, ServiceCIDR v1Alpha1ServiceCIDR, ServiceCIDRList v1Alpha1ServiceCIDRList, io.fabric8.kubernetes.api.model.networking.v1.Ingress v1Ingress, io.fabric8.kubernetes.api.model.networking.v1.IngressClass v1IngressClass, io.fabric8.kubernetes.api.model.networking.v1.IngressClassList v1IngressClassList, io.fabric8.kubernetes.api.model.networking.v1.IngressList v1IngressList) { - super(); - this.aPIGroup = aPIGroup; - this.aPIGroupList = aPIGroupList; - this.baseKubernetesList = baseKubernetesList; - this.createOptions = createOptions; - this.deleteOptions = deleteOptions; - this.getOptions = getOptions; - this.info = info; - this.ingress = ingress; - this.ingressClass = ingressClass; - this.ingressClassList = ingressClassList; - this.ingressList = ingressList; - this.listOptions = listOptions; - this.networkPolicy = networkPolicy; - this.networkPolicyList = networkPolicyList; - this.objectMeta = objectMeta; - this.objectReference = objectReference; - this.patch = patch; - this.patchOptions = patchOptions; - this.quantity = quantity; - this.rootPaths = rootPaths; - this.status = status; - this.time = time; - this.typeMeta = typeMeta; - this.updateOptions = updateOptions; - this.v1Alpha1IPAddress = v1Alpha1IPAddress; - this.v1Alpha1IPAddressList = v1Alpha1IPAddressList; - this.v1Alpha1ServiceCIDR = v1Alpha1ServiceCIDR; - this.v1Alpha1ServiceCIDRList = v1Alpha1ServiceCIDRList; - this.v1Ingress = v1Ingress; - this.v1IngressClass = v1IngressClass; - this.v1IngressClassList = v1IngressClassList; - this.v1IngressList = v1IngressList; - } - - @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("CreateOptions") - public CreateOptions getCreateOptions() { - return createOptions; - } - - @JsonProperty("CreateOptions") - public void setCreateOptions(CreateOptions createOptions) { - this.createOptions = createOptions; - } - - @JsonProperty("DeleteOptions") - public DeleteOptions getDeleteOptions() { - return deleteOptions; - } - - @JsonProperty("DeleteOptions") - public void setDeleteOptions(DeleteOptions deleteOptions) { - this.deleteOptions = deleteOptions; - } - - @JsonProperty("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("Ingress") - public io.fabric8.kubernetes.api.model.networking.v1beta1.Ingress getIngress() { - return ingress; - } - - @JsonProperty("Ingress") - public void setIngress(io.fabric8.kubernetes.api.model.networking.v1beta1.Ingress ingress) { - this.ingress = ingress; - } - - @JsonProperty("IngressClass") - public io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClass getIngressClass() { - return ingressClass; - } - - @JsonProperty("IngressClass") - public void setIngressClass(io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClass ingressClass) { - this.ingressClass = ingressClass; - } - - @JsonProperty("IngressClassList") - public io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClassList getIngressClassList() { - return ingressClassList; - } - - @JsonProperty("IngressClassList") - public void setIngressClassList(io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClassList ingressClassList) { - this.ingressClassList = ingressClassList; - } - - @JsonProperty("IngressList") - public io.fabric8.kubernetes.api.model.networking.v1beta1.IngressList getIngressList() { - return ingressList; - } - - @JsonProperty("IngressList") - public void setIngressList(io.fabric8.kubernetes.api.model.networking.v1beta1.IngressList ingressList) { - this.ingressList = ingressList; - } - - @JsonProperty("ListOptions") - public ListOptions getListOptions() { - return listOptions; - } - - @JsonProperty("ListOptions") - public void setListOptions(ListOptions listOptions) { - this.listOptions = listOptions; - } - - @JsonProperty("NetworkPolicy") - public NetworkPolicy getNetworkPolicy() { - return networkPolicy; - } - - @JsonProperty("NetworkPolicy") - public void setNetworkPolicy(NetworkPolicy networkPolicy) { - this.networkPolicy = networkPolicy; - } - - @JsonProperty("NetworkPolicyList") - public NetworkPolicyList getNetworkPolicyList() { - return networkPolicyList; - } - - @JsonProperty("NetworkPolicyList") - public void setNetworkPolicyList(NetworkPolicyList networkPolicyList) { - this.networkPolicyList = networkPolicyList; - } - - @JsonProperty("ObjectMeta") - public ObjectMeta getObjectMeta() { - return objectMeta; - } - - @JsonProperty("ObjectMeta") - public void setObjectMeta(ObjectMeta objectMeta) { - this.objectMeta = objectMeta; - } - - @JsonProperty("ObjectReference") - public ObjectReference getObjectReference() { - return objectReference; - } - - @JsonProperty("ObjectReference") - public void setObjectReference(ObjectReference objectReference) { - this.objectReference = objectReference; - } - - @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("Quantity") - public Quantity getQuantity() { - return quantity; - } - - @JsonProperty("Quantity") - public void setQuantity(Quantity quantity) { - this.quantity = quantity; - } - - @JsonProperty("RootPaths") - public RootPaths getRootPaths() { - return rootPaths; - } - - @JsonProperty("RootPaths") - public void setRootPaths(RootPaths rootPaths) { - this.rootPaths = rootPaths; - } - - @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("UpdateOptions") - public UpdateOptions getUpdateOptions() { - return updateOptions; - } - - @JsonProperty("UpdateOptions") - public void setUpdateOptions(UpdateOptions updateOptions) { - this.updateOptions = updateOptions; - } - - @JsonProperty("V1Alpha1IPAddress") - public IPAddress getV1Alpha1IPAddress() { - return v1Alpha1IPAddress; - } - - @JsonProperty("V1Alpha1IPAddress") - public void setV1Alpha1IPAddress(IPAddress v1Alpha1IPAddress) { - this.v1Alpha1IPAddress = v1Alpha1IPAddress; - } - - @JsonProperty("V1Alpha1IPAddressList") - public IPAddressList getV1Alpha1IPAddressList() { - return v1Alpha1IPAddressList; - } - - @JsonProperty("V1Alpha1IPAddressList") - public void setV1Alpha1IPAddressList(IPAddressList v1Alpha1IPAddressList) { - this.v1Alpha1IPAddressList = v1Alpha1IPAddressList; - } - - @JsonProperty("V1Alpha1ServiceCIDR") - public ServiceCIDR getV1Alpha1ServiceCIDR() { - return v1Alpha1ServiceCIDR; - } - - @JsonProperty("V1Alpha1ServiceCIDR") - public void setV1Alpha1ServiceCIDR(ServiceCIDR v1Alpha1ServiceCIDR) { - this.v1Alpha1ServiceCIDR = v1Alpha1ServiceCIDR; - } - - @JsonProperty("V1Alpha1ServiceCIDRList") - public ServiceCIDRList getV1Alpha1ServiceCIDRList() { - return v1Alpha1ServiceCIDRList; - } - - @JsonProperty("V1Alpha1ServiceCIDRList") - public void setV1Alpha1ServiceCIDRList(ServiceCIDRList v1Alpha1ServiceCIDRList) { - this.v1Alpha1ServiceCIDRList = v1Alpha1ServiceCIDRList; - } - - @JsonProperty("V1Ingress") - public io.fabric8.kubernetes.api.model.networking.v1.Ingress getV1Ingress() { - return v1Ingress; - } - - @JsonProperty("V1Ingress") - public void setV1Ingress(io.fabric8.kubernetes.api.model.networking.v1.Ingress v1Ingress) { - this.v1Ingress = v1Ingress; - } - - @JsonProperty("V1IngressClass") - public io.fabric8.kubernetes.api.model.networking.v1.IngressClass getV1IngressClass() { - return v1IngressClass; - } - - @JsonProperty("V1IngressClass") - public void setV1IngressClass(io.fabric8.kubernetes.api.model.networking.v1.IngressClass v1IngressClass) { - this.v1IngressClass = v1IngressClass; - } - - @JsonProperty("V1IngressClassList") - public io.fabric8.kubernetes.api.model.networking.v1.IngressClassList getV1IngressClassList() { - return v1IngressClassList; - } - - @JsonProperty("V1IngressClassList") - public void setV1IngressClassList(io.fabric8.kubernetes.api.model.networking.v1.IngressClassList v1IngressClassList) { - this.v1IngressClassList = v1IngressClassList; - } - - @JsonProperty("V1IngressList") - public io.fabric8.kubernetes.api.model.networking.v1.IngressList getV1IngressList() { - return v1IngressList; - } - - @JsonProperty("V1IngressList") - public void setV1IngressList(io.fabric8.kubernetes.api.model.networking.v1.IngressList v1IngressList) { - this.v1IngressList = v1IngressList; - } - - @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-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/Ingress.java b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/Ingress.java index 09f0a99383c..f13fd77f6de 100644 --- a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/Ingress.java +++ b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/Ingress.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 Ingress implements Editable , HasMetadata, Namespac @JsonProperty("kind") private String kind = "Ingress"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("spec") private IngressSpec spec; @JsonProperty("status") @@ -97,7 +98,7 @@ public class Ingress implements Editable , HasMetadata, Namespac public Ingress() { } - public Ingress(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, IngressSpec spec, IngressStatus status) { + public Ingress(String apiVersion, String kind, ObjectMeta metadata, IngressSpec spec, IngressStatus 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-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/IngressClass.java b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/IngressClass.java index 8baece75349..1e726a93688 100644 --- a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/IngressClass.java +++ b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/IngressClass.java @@ -17,6 +17,7 @@ import io.fabric8.kubernetes.api.model.IntOrString; import io.fabric8.kubernetes.api.model.LabelSelector; import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -46,7 +47,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), @@ -80,7 +81,7 @@ public class IngressClass implements Editable , HasMetadata @JsonProperty("kind") private String kind = "IngressClass"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("spec") private IngressClassSpec spec; @JsonIgnore @@ -93,7 +94,7 @@ public class IngressClass implements Editable , HasMetadata public IngressClass() { } - public IngressClass(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, IngressClassSpec spec) { + public IngressClass(String apiVersion, String kind, ObjectMeta metadata, IngressClassSpec spec) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -142,12 +143,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-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/NetworkPolicy.java b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/NetworkPolicy.java index 10e336c25e6..43e68dfd047 100644 --- a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/NetworkPolicy.java +++ b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/NetworkPolicy.java @@ -18,6 +18,7 @@ import io.fabric8.kubernetes.api.model.LabelSelector; import io.fabric8.kubernetes.api.model.LocalObjectReference; import io.fabric8.kubernetes.api.model.Namespaced; +import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -47,7 +48,7 @@ "" }) @Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), + @BuildableReference(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @@ -81,7 +82,7 @@ public class NetworkPolicy implements Editable , HasMetada @JsonProperty("kind") private String kind = "NetworkPolicy"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("spec") private NetworkPolicySpec spec; @JsonIgnore @@ -94,7 +95,7 @@ public class NetworkPolicy implements Editable , HasMetada public NetworkPolicy() { } - public NetworkPolicy(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, NetworkPolicySpec spec) { + public NetworkPolicy(String apiVersion, String kind, ObjectMeta metadata, NetworkPolicySpec spec) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -143,12 +144,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-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/NetworkPolicyPeer.java b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/NetworkPolicyPeer.java index 67574ede1f7..1ff7421cf88 100644 --- a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/NetworkPolicyPeer.java +++ b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/NetworkPolicyPeer.java @@ -15,6 +15,7 @@ import io.fabric8.kubernetes.api.model.Container; import io.fabric8.kubernetes.api.model.IntOrString; import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; import io.fabric8.kubernetes.api.model.LocalObjectReference; import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; @@ -42,7 +43,7 @@ }) @Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { @BuildableReference(ObjectMeta.class), - @BuildableReference(io.fabric8.kubernetes.api.model.LabelSelector.class), + @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @BuildableReference(ResourceRequirements.class), @@ -58,9 +59,9 @@ public class NetworkPolicyPeer implements Editable , K @JsonProperty("ipBlock") private IPBlock ipBlock; @JsonProperty("namespaceSelector") - private io.fabric8.kubernetes.api.model.LabelSelector namespaceSelector; + private LabelSelector namespaceSelector; @JsonProperty("podSelector") - private io.fabric8.kubernetes.api.model.LabelSelector podSelector; + private LabelSelector podSelector; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -71,7 +72,7 @@ public class NetworkPolicyPeer implements Editable , K public NetworkPolicyPeer() { } - public NetworkPolicyPeer(IPBlock ipBlock, io.fabric8.kubernetes.api.model.LabelSelector namespaceSelector, io.fabric8.kubernetes.api.model.LabelSelector podSelector) { + public NetworkPolicyPeer(IPBlock ipBlock, LabelSelector namespaceSelector, LabelSelector podSelector) { super(); this.ipBlock = ipBlock; this.namespaceSelector = namespaceSelector; @@ -89,22 +90,22 @@ public void setIpBlock(IPBlock ipBlock) { } @JsonProperty("namespaceSelector") - public io.fabric8.kubernetes.api.model.LabelSelector getNamespaceSelector() { + public LabelSelector getNamespaceSelector() { return namespaceSelector; } @JsonProperty("namespaceSelector") - public void setNamespaceSelector(io.fabric8.kubernetes.api.model.LabelSelector namespaceSelector) { + public void setNamespaceSelector(LabelSelector namespaceSelector) { this.namespaceSelector = namespaceSelector; } @JsonProperty("podSelector") - public io.fabric8.kubernetes.api.model.LabelSelector getPodSelector() { + public LabelSelector getPodSelector() { return podSelector; } @JsonProperty("podSelector") - public void setPodSelector(io.fabric8.kubernetes.api.model.LabelSelector podSelector) { + public void setPodSelector(LabelSelector podSelector) { this.podSelector = podSelector; } diff --git a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/NetworkPolicyPort.java b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/NetworkPolicyPort.java index d582359f2b0..ff1c041ab9c 100644 --- a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/NetworkPolicyPort.java +++ b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/NetworkPolicyPort.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; @@ -46,7 +47,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) @@ -58,7 +59,7 @@ public class NetworkPolicyPort implements Editable , K @JsonProperty("endPort") private Integer endPort; @JsonProperty("port") - private io.fabric8.kubernetes.api.model.IntOrString port; + private IntOrString port; @JsonProperty("protocol") private String protocol; @JsonIgnore @@ -71,7 +72,7 @@ public class NetworkPolicyPort implements Editable , K public NetworkPolicyPort() { } - public NetworkPolicyPort(Integer endPort, io.fabric8.kubernetes.api.model.IntOrString port, String protocol) { + public NetworkPolicyPort(Integer endPort, IntOrString port, String protocol) { super(); this.endPort = endPort; this.port = port; @@ -89,12 +90,12 @@ public void setEndPort(Integer endPort) { } @JsonProperty("port") - public io.fabric8.kubernetes.api.model.IntOrString getPort() { + public IntOrString getPort() { return port; } @JsonProperty("port") - public void setPort(io.fabric8.kubernetes.api.model.IntOrString port) { + public void setPort(IntOrString port) { this.port = port; } diff --git a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/NetworkPolicySpec.java b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/NetworkPolicySpec.java index 7ddc2cfb513..8840f3018da 100644 --- a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/NetworkPolicySpec.java +++ b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/NetworkPolicySpec.java @@ -17,6 +17,7 @@ import io.fabric8.kubernetes.api.model.Container; import io.fabric8.kubernetes.api.model.IntOrString; import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; import io.fabric8.kubernetes.api.model.LocalObjectReference; import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; @@ -45,7 +46,7 @@ }) @Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { @BuildableReference(ObjectMeta.class), - @BuildableReference(io.fabric8.kubernetes.api.model.LabelSelector.class), + @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @BuildableReference(ResourceRequirements.class), @@ -65,7 +66,7 @@ public class NetworkPolicySpec implements Editable , K @JsonInclude(JsonInclude.Include.NON_EMPTY) private List ingress = new ArrayList<>(); @JsonProperty("podSelector") - private io.fabric8.kubernetes.api.model.LabelSelector podSelector; + private LabelSelector podSelector; @JsonProperty("policyTypes") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List policyTypes = new ArrayList<>(); @@ -79,7 +80,7 @@ public class NetworkPolicySpec implements Editable , K public NetworkPolicySpec() { } - public NetworkPolicySpec(List egress, List ingress, io.fabric8.kubernetes.api.model.LabelSelector podSelector, List policyTypes) { + public NetworkPolicySpec(List egress, List ingress, LabelSelector podSelector, List policyTypes) { super(); this.egress = egress; this.ingress = ingress; @@ -110,12 +111,12 @@ public void setIngress(List ingress) { } @JsonProperty("podSelector") - public io.fabric8.kubernetes.api.model.LabelSelector getPodSelector() { + public LabelSelector getPodSelector() { return podSelector; } @JsonProperty("podSelector") - public void setPodSelector(io.fabric8.kubernetes.api.model.LabelSelector podSelector) { + public void setPodSelector(LabelSelector podSelector) { this.podSelector = podSelector; } diff --git a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1alpha1/IPAddress.java b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1alpha1/IPAddress.java index f1395935b80..0711bb43770 100644 --- a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1alpha1/IPAddress.java +++ b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1alpha1/IPAddress.java @@ -17,6 +17,7 @@ import io.fabric8.kubernetes.api.model.IntOrString; import io.fabric8.kubernetes.api.model.LabelSelector; import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -46,7 +47,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), @@ -80,7 +81,7 @@ public class IPAddress implements Editable , HasMetadata @JsonProperty("kind") private String kind = "IPAddress"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("spec") private IPAddressSpec spec; @JsonIgnore @@ -93,7 +94,7 @@ public class IPAddress implements Editable , HasMetadata public IPAddress() { } - public IPAddress(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, IPAddressSpec spec) { + public IPAddress(String apiVersion, String kind, ObjectMeta metadata, IPAddressSpec spec) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -142,12 +143,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-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1alpha1/ServiceCIDR.java b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1alpha1/ServiceCIDR.java index 108697f300c..0e65c9778cd 100644 --- a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1alpha1/ServiceCIDR.java +++ b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1alpha1/ServiceCIDR.java @@ -17,6 +17,7 @@ import io.fabric8.kubernetes.api.model.IntOrString; import io.fabric8.kubernetes.api.model.LabelSelector; import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -47,7 +48,7 @@ "" }) @Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), + @BuildableReference(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @@ -81,7 +82,7 @@ public class ServiceCIDR implements Editable , HasMetadata @JsonProperty("kind") private String kind = "ServiceCIDR"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("spec") private ServiceCIDRSpec spec; @JsonProperty("status") @@ -96,7 +97,7 @@ public class ServiceCIDR implements Editable , HasMetadata public ServiceCIDR() { } - public ServiceCIDR(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, ServiceCIDRSpec spec, ServiceCIDRStatus status) { + public ServiceCIDR(String apiVersion, String kind, ObjectMeta metadata, ServiceCIDRSpec spec, ServiceCIDRStatus status) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -146,12 +147,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1beta1/Ingress.java b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1beta1/Ingress.java index c82ba0670ce..4cb3e58fc2c 100644 --- a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1beta1/Ingress.java +++ b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1beta1/Ingress.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 Ingress implements Editable , HasMetadata, Namespac @JsonProperty("kind") private String kind = "Ingress"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("spec") private IngressSpec spec; @JsonProperty("status") @@ -97,7 +98,7 @@ public class Ingress implements Editable , HasMetadata, Namespac public Ingress() { } - public Ingress(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, IngressSpec spec, IngressStatus status) { + public Ingress(String apiVersion, String kind, ObjectMeta metadata, IngressSpec spec, IngressStatus 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-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1beta1/IngressBackend.java b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1beta1/IngressBackend.java index aa6bee1ed75..78d48a96878 100644 --- a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1beta1/IngressBackend.java +++ b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1beta1/IngressBackend.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; @@ -47,7 +48,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) @@ -61,7 +62,7 @@ public class IngressBackend implements Editable , Kuberne @JsonProperty("serviceName") private String serviceName; @JsonProperty("servicePort") - private io.fabric8.kubernetes.api.model.IntOrString servicePort; + private IntOrString servicePort; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -72,7 +73,7 @@ public class IngressBackend implements Editable , Kuberne public IngressBackend() { } - public IngressBackend(TypedLocalObjectReference resource, String serviceName, io.fabric8.kubernetes.api.model.IntOrString servicePort) { + public IngressBackend(TypedLocalObjectReference resource, String serviceName, IntOrString servicePort) { super(); this.resource = resource; this.serviceName = serviceName; @@ -100,12 +101,12 @@ public void setServiceName(String serviceName) { } @JsonProperty("servicePort") - public io.fabric8.kubernetes.api.model.IntOrString getServicePort() { + public IntOrString getServicePort() { return servicePort; } @JsonProperty("servicePort") - public void setServicePort(io.fabric8.kubernetes.api.model.IntOrString servicePort) { + public void setServicePort(IntOrString servicePort) { this.servicePort = servicePort; } diff --git a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1beta1/IngressClass.java b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1beta1/IngressClass.java index 7f337d986bc..dce903177ab 100644 --- a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1beta1/IngressClass.java +++ b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1beta1/IngressClass.java @@ -17,6 +17,7 @@ import io.fabric8.kubernetes.api.model.IntOrString; import io.fabric8.kubernetes.api.model.LabelSelector; import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -46,7 +47,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), @@ -80,7 +81,7 @@ public class IngressClass implements Editable , HasMetadata @JsonProperty("kind") private String kind = "IngressClass"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("spec") private IngressClassSpec spec; @JsonIgnore @@ -93,7 +94,7 @@ public class IngressClass implements Editable , HasMetadata public IngressClass() { } - public IngressClass(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, IngressClassSpec spec) { + public IngressClass(String apiVersion, String kind, ObjectMeta metadata, IngressClassSpec spec) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -142,12 +143,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-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1beta1/IngressLoadBalancerIngress.java b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1beta1/IngressLoadBalancerIngress.java deleted file mode 100644 index 1088bdef6dd..00000000000 --- a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1beta1/IngressLoadBalancerIngress.java +++ /dev/null @@ -1,140 +0,0 @@ - -package io.fabric8.kubernetes.api.model.networking.v1beta1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "hostname", - "ip", - "ports" -}) -@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 IngressLoadBalancerIngress implements Editable , KubernetesResource -{ - - @JsonProperty("hostname") - private String hostname; - @JsonProperty("ip") - private String ip; - @JsonProperty("ports") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List ports = new ArrayList<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public IngressLoadBalancerIngress() { - } - - public IngressLoadBalancerIngress(String hostname, String ip, List ports) { - super(); - this.hostname = hostname; - this.ip = ip; - this.ports = ports; - } - - @JsonProperty("hostname") - public String getHostname() { - return hostname; - } - - @JsonProperty("hostname") - public void setHostname(String hostname) { - this.hostname = hostname; - } - - @JsonProperty("ip") - public String getIp() { - return ip; - } - - @JsonProperty("ip") - public void setIp(String ip) { - this.ip = ip; - } - - @JsonProperty("ports") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getPorts() { - return ports; - } - - @JsonProperty("ports") - public void setPorts(List ports) { - this.ports = ports; - } - - @JsonIgnore - public IngressLoadBalancerIngressBuilder edit() { - return new IngressLoadBalancerIngressBuilder(this); - } - - @JsonIgnore - public IngressLoadBalancerIngressBuilder 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/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1beta1/IngressLoadBalancerStatus.java b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1beta1/IngressLoadBalancerStatus.java deleted file mode 100644 index fdc0cadd952..00000000000 --- a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1beta1/IngressLoadBalancerStatus.java +++ /dev/null @@ -1,112 +0,0 @@ - -package io.fabric8.kubernetes.api.model.networking.v1beta1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "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 IngressLoadBalancerStatus implements Editable , KubernetesResource -{ - - @JsonProperty("ingress") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List ingress = new ArrayList<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public IngressLoadBalancerStatus() { - } - - public IngressLoadBalancerStatus(List ingress) { - super(); - this.ingress = ingress; - } - - @JsonProperty("ingress") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getIngress() { - return ingress; - } - - @JsonProperty("ingress") - public void setIngress(List ingress) { - this.ingress = ingress; - } - - @JsonIgnore - public IngressLoadBalancerStatusBuilder edit() { - return new IngressLoadBalancerStatusBuilder(this); - } - - @JsonIgnore - public IngressLoadBalancerStatusBuilder 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/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1beta1/IngressPortStatus.java b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1beta1/IngressPortStatus.java deleted file mode 100644 index f8c42da5e3e..00000000000 --- a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1beta1/IngressPortStatus.java +++ /dev/null @@ -1,136 +0,0 @@ - -package io.fabric8.kubernetes.api.model.networking.v1beta1; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "error", - "port", - "protocol" -}) -@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 IngressPortStatus implements Editable , KubernetesResource -{ - - @JsonProperty("error") - private String error; - @JsonProperty("port") - private Integer port; - @JsonProperty("protocol") - private String protocol; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public IngressPortStatus() { - } - - public IngressPortStatus(String error, Integer port, String protocol) { - super(); - this.error = error; - this.port = port; - this.protocol = protocol; - } - - @JsonProperty("error") - public String getError() { - return error; - } - - @JsonProperty("error") - public void setError(String error) { - this.error = error; - } - - @JsonProperty("port") - public Integer getPort() { - return port; - } - - @JsonProperty("port") - public void setPort(Integer port) { - this.port = port; - } - - @JsonProperty("protocol") - public String getProtocol() { - return protocol; - } - - @JsonProperty("protocol") - public void setProtocol(String protocol) { - this.protocol = protocol; - } - - @JsonIgnore - public IngressPortStatusBuilder edit() { - return new IngressPortStatusBuilder(this); - } - - @JsonIgnore - public IngressPortStatusBuilder 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/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1beta1/IngressStatus.java b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1beta1/IngressStatus.java index 27c74296074..ee3ad84c85c 100644 --- a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1beta1/IngressStatus.java +++ b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1beta1/IngressStatus.java @@ -16,6 +16,7 @@ import io.fabric8.kubernetes.api.model.IntOrString; import io.fabric8.kubernetes.api.model.KubernetesResource; import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LoadBalancerStatus; import io.fabric8.kubernetes.api.model.LocalObjectReference; import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; @@ -55,7 +56,7 @@ public class IngressStatus implements Editable , Kubernete { @JsonProperty("loadBalancer") - private IngressLoadBalancerStatus loadBalancer; + private LoadBalancerStatus loadBalancer; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -66,18 +67,18 @@ public class IngressStatus implements Editable , Kubernete public IngressStatus() { } - public IngressStatus(IngressLoadBalancerStatus loadBalancer) { + public IngressStatus(LoadBalancerStatus loadBalancer) { super(); this.loadBalancer = loadBalancer; } @JsonProperty("loadBalancer") - public IngressLoadBalancerStatus getLoadBalancer() { + public LoadBalancerStatus getLoadBalancer() { return loadBalancer; } @JsonProperty("loadBalancer") - public void setLoadBalancer(IngressLoadBalancerStatus loadBalancer) { + public void setLoadBalancer(LoadBalancerStatus loadBalancer) { this.loadBalancer = loadBalancer; } diff --git a/kubernetes-model-generator/openapi/maven-plugin/src/test/java/io/fabric8/kubernetes/schema/generator/model/KubernetesTest.java b/kubernetes-model-generator/openapi/maven-plugin/src/test/java/io/fabric8/kubernetes/schema/generator/model/KubernetesTest.java index 19ffb18a096..45abaf64ac4 100644 --- a/kubernetes-model-generator/openapi/maven-plugin/src/test/java/io/fabric8/kubernetes/schema/generator/model/KubernetesTest.java +++ b/kubernetes-model-generator/openapi/maven-plugin/src/test/java/io/fabric8/kubernetes/schema/generator/model/KubernetesTest.java @@ -45,17 +45,6 @@ void setUp() { .generateJavadoc(false); } - @Test - void gatewayApi() { - new ModelGenerator(baseSettings - .clearSchemas() - .schema(new File("../schemas/gateway-api.json")) - .includeGenerationRegex("^io\\.k8s\\.sigs\\.gateway-api\\.apis\\..*$") - .packageMapping("io.k8s.sigs.gateway-api.apis", "io.fabric8.kubernetes.api.model.gatewayapi") - .build()) - .generate(); - } - @Test void kustomize() { new ModelGenerator(baseSettings @@ -79,18 +68,6 @@ void metrics() { .generate(); } - @Test - void networking() { - new ModelGenerator(baseSettings - .clearSchemas() - .schema(new File("../schemas/kubernetes-1.21.14.json")) - .schema(new File("../schemas/kubernetes-1.30.0.json")) - .includeGenerationRegex("^io\\.k8s\\.api\\.networking\\..*$") - .packageMapping("io.k8s.api.networking", "io.fabric8.kubernetes.api.model.networking") - .build()) - .generate(); - } - @Test void node() { new ModelGenerator(baseSettings