diff --git a/Makefile b/Makefile index 9091985deb8..5871f8f9502 100644 --- a/Makefile +++ b/Makefile @@ -43,6 +43,7 @@ generate-openapi-classes: cd kubernetes-model-generator/kubernetes-model-batch && mvn -Pgenerate clean install cd kubernetes-model-generator/kubernetes-model-certificates && mvn -Pgenerate clean install cd kubernetes-model-generator/kubernetes-model-coordination && mvn -Pgenerate clean install + cd kubernetes-model-generator/kubernetes-model-discovery && 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 d81e64d459c..85a35b9e77a 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-discovery" "kubernetes-model-events" "kubernetes-model-extensions" "kubernetes-model-flowcontrol" diff --git a/kubernetes-model-generator/kubernetes-model-discovery/Makefile b/kubernetes-model-generator/kubernetes-model-discovery/Makefile deleted file mode 100644 index c09a7003874..00000000000 --- a/kubernetes-model-generator/kubernetes-model-discovery/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-discovery/cmd/generate/generate.go b/kubernetes-model-generator/kubernetes-model-discovery/cmd/generate/generate.go deleted file mode 100644 index 68e5afae42c..00000000000 --- a/kubernetes-model-generator/kubernetes-model-discovery/cmd/generate/generate.go +++ /dev/null @@ -1,108 +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" - - discovery "k8s.io/api/discovery/v1beta1" - discoveryv1 "k8s.io/api/discovery/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 - ObjectReference kapi.ObjectReference - - DiscoveryEndpointPort discovery.EndpointPort - EndpointSlice discovery.EndpointSlice - EndpointSliceList discovery.EndpointSliceList - V1EndpointSlice discoveryv1.EndpointSlice - V1EndpointSliceList discoveryv1.EndpointSliceList -} - -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/discovery/v1beta1", "discovery.k8s.io", "io.fabric8.kubernetes.api.model.discovery.v1beta1", "kubernetes_discovery_v1beta1_", true}, - {"k8s.io/api/discovery/v1", "discovery.k8s.io", "io.fabric8.kubernetes.api.model.discovery.v1", "kubernetes_discovery_v1_", 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{},"discovery") - 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-discovery/pom.xml b/kubernetes-model-generator/kubernetes-model-discovery/pom.xml index 48c026c8e50..70f62cfbc16 100644 --- a/kubernetes-model-generator/kubernetes-model-discovery/pom.xml +++ b/kubernetes-model-generator/kubernetes-model-discovery/pom.xml @@ -41,37 +41,30 @@ io.fabric8 kubernetes-model-core - - io.fabric8 - kubernetes-model-common - - - - - 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.discovery + + + ^io\.k8s\.api\.discovery\..*$ + + + diff --git a/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java deleted file mode 100644 index 16870c68162..00000000000 --- a/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ /dev/null @@ -1,321 +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.discovery.v1beta1.EndpointPort; -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 EndpointPort discoveryEndpointPort; - private io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointSlice endpointSlice; - private io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointSliceList endpointSliceList; - private GetOptions getOptions; - private Info info; - private ListOptions listOptions; - 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 io.fabric8.kubernetes.api.model.discovery.v1.EndpointSlice v1EndpointSlice; - private io.fabric8.kubernetes.api.model.discovery.v1.EndpointSliceList v1EndpointSliceList; - @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, EndpointPort discoveryEndpointPort, io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointSlice endpointSlice, io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointSliceList endpointSliceList, GetOptions getOptions, Info info, ListOptions listOptions, ObjectMeta objectMeta, ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.discovery.v1.EndpointSlice v1EndpointSlice, io.fabric8.kubernetes.api.model.discovery.v1.EndpointSliceList v1EndpointSliceList) { - super(); - this.aPIGroup = aPIGroup; - this.aPIGroupList = aPIGroupList; - this.baseKubernetesList = baseKubernetesList; - this.createOptions = createOptions; - this.deleteOptions = deleteOptions; - this.discoveryEndpointPort = discoveryEndpointPort; - this.endpointSlice = endpointSlice; - this.endpointSliceList = endpointSliceList; - this.getOptions = getOptions; - this.info = info; - this.listOptions = listOptions; - 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.v1EndpointSlice = v1EndpointSlice; - this.v1EndpointSliceList = v1EndpointSliceList; - } - - @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("DiscoveryEndpointPort") - public EndpointPort getDiscoveryEndpointPort() { - return discoveryEndpointPort; - } - - @JsonProperty("DiscoveryEndpointPort") - public void setDiscoveryEndpointPort(EndpointPort discoveryEndpointPort) { - this.discoveryEndpointPort = discoveryEndpointPort; - } - - @JsonProperty("EndpointSlice") - public io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointSlice getEndpointSlice() { - return endpointSlice; - } - - @JsonProperty("EndpointSlice") - public void setEndpointSlice(io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointSlice endpointSlice) { - this.endpointSlice = endpointSlice; - } - - @JsonProperty("EndpointSliceList") - public io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointSliceList getEndpointSliceList() { - return endpointSliceList; - } - - @JsonProperty("EndpointSliceList") - public void setEndpointSliceList(io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointSliceList endpointSliceList) { - this.endpointSliceList = endpointSliceList; - } - - @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("ListOptions") - public ListOptions getListOptions() { - return listOptions; - } - - @JsonProperty("ListOptions") - public void setListOptions(ListOptions listOptions) { - this.listOptions = listOptions; - } - - @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("V1EndpointSlice") - public io.fabric8.kubernetes.api.model.discovery.v1.EndpointSlice getV1EndpointSlice() { - return v1EndpointSlice; - } - - @JsonProperty("V1EndpointSlice") - public void setV1EndpointSlice(io.fabric8.kubernetes.api.model.discovery.v1.EndpointSlice v1EndpointSlice) { - this.v1EndpointSlice = v1EndpointSlice; - } - - @JsonProperty("V1EndpointSliceList") - public io.fabric8.kubernetes.api.model.discovery.v1.EndpointSliceList getV1EndpointSliceList() { - return v1EndpointSliceList; - } - - @JsonProperty("V1EndpointSliceList") - public void setV1EndpointSliceList(io.fabric8.kubernetes.api.model.discovery.v1.EndpointSliceList v1EndpointSliceList) { - this.v1EndpointSliceList = v1EndpointSliceList; - } - - @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-discovery/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java deleted file mode 100644 index c27e21adf8a..00000000000 --- a/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ /dev/null @@ -1,321 +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.discovery.v1beta1.EndpointPort; -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 EndpointPort discoveryEndpointPort; - private io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointSlice endpointSlice; - private io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointSliceList endpointSliceList; - private GetOptions getOptions; - private Info info; - private ListOptions listOptions; - 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 io.fabric8.kubernetes.api.model.discovery.v1.EndpointSlice v1EndpointSlice; - private io.fabric8.kubernetes.api.model.discovery.v1.EndpointSliceList v1EndpointSliceList; - @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, EndpointPort discoveryEndpointPort, io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointSlice endpointSlice, io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointSliceList endpointSliceList, GetOptions getOptions, Info info, ListOptions listOptions, ObjectMeta objectMeta, ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.discovery.v1.EndpointSlice v1EndpointSlice, io.fabric8.kubernetes.api.model.discovery.v1.EndpointSliceList v1EndpointSliceList) { - super(); - this.aPIGroup = aPIGroup; - this.aPIGroupList = aPIGroupList; - this.baseKubernetesList = baseKubernetesList; - this.createOptions = createOptions; - this.deleteOptions = deleteOptions; - this.discoveryEndpointPort = discoveryEndpointPort; - this.endpointSlice = endpointSlice; - this.endpointSliceList = endpointSliceList; - this.getOptions = getOptions; - this.info = info; - this.listOptions = listOptions; - 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.v1EndpointSlice = v1EndpointSlice; - this.v1EndpointSliceList = v1EndpointSliceList; - } - - @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("DiscoveryEndpointPort") - public EndpointPort getDiscoveryEndpointPort() { - return discoveryEndpointPort; - } - - @JsonProperty("DiscoveryEndpointPort") - public void setDiscoveryEndpointPort(EndpointPort discoveryEndpointPort) { - this.discoveryEndpointPort = discoveryEndpointPort; - } - - @JsonProperty("EndpointSlice") - public io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointSlice getEndpointSlice() { - return endpointSlice; - } - - @JsonProperty("EndpointSlice") - public void setEndpointSlice(io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointSlice endpointSlice) { - this.endpointSlice = endpointSlice; - } - - @JsonProperty("EndpointSliceList") - public io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointSliceList getEndpointSliceList() { - return endpointSliceList; - } - - @JsonProperty("EndpointSliceList") - public void setEndpointSliceList(io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointSliceList endpointSliceList) { - this.endpointSliceList = endpointSliceList; - } - - @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("ListOptions") - public ListOptions getListOptions() { - return listOptions; - } - - @JsonProperty("ListOptions") - public void setListOptions(ListOptions listOptions) { - this.listOptions = listOptions; - } - - @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("V1EndpointSlice") - public io.fabric8.kubernetes.api.model.discovery.v1.EndpointSlice getV1EndpointSlice() { - return v1EndpointSlice; - } - - @JsonProperty("V1EndpointSlice") - public void setV1EndpointSlice(io.fabric8.kubernetes.api.model.discovery.v1.EndpointSlice v1EndpointSlice) { - this.v1EndpointSlice = v1EndpointSlice; - } - - @JsonProperty("V1EndpointSliceList") - public io.fabric8.kubernetes.api.model.discovery.v1.EndpointSliceList getV1EndpointSliceList() { - return v1EndpointSliceList; - } - - @JsonProperty("V1EndpointSliceList") - public void setV1EndpointSliceList(io.fabric8.kubernetes.api.model.discovery.v1.EndpointSliceList v1EndpointSliceList) { - this.v1EndpointSliceList = v1EndpointSliceList; - } - - @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-discovery/src/generated/java/io/fabric8/kubernetes/api/model/discovery/v1/Endpoint.java b/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/discovery/v1/Endpoint.java index 5626dfef724..5071d7c6a1e 100644 --- a/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/discovery/v1/Endpoint.java +++ b/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/discovery/v1/Endpoint.java @@ -20,6 +20,7 @@ import io.fabric8.kubernetes.api.model.LabelSelector; import io.fabric8.kubernetes.api.model.LocalObjectReference; import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.ResourceRequirements; @@ -54,7 +55,7 @@ @BuildableReference(PodTemplateSpec.class), @BuildableReference(ResourceRequirements.class), @BuildableReference(IntOrString.class), - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class), + @BuildableReference(ObjectReference.class), @BuildableReference(LocalObjectReference.class), @BuildableReference(PersistentVolumeClaim.class) }) @@ -77,7 +78,7 @@ public class Endpoint implements Editable , KubernetesResource @JsonProperty("nodeName") private String nodeName; @JsonProperty("targetRef") - private io.fabric8.kubernetes.api.model.ObjectReference targetRef; + private ObjectReference targetRef; @JsonProperty("zone") private String zone; @JsonIgnore @@ -90,7 +91,7 @@ public class Endpoint implements Editable , KubernetesResource public Endpoint() { } - public Endpoint(List addresses, EndpointConditions conditions, Map deprecatedTopology, EndpointHints hints, String hostname, String nodeName, io.fabric8.kubernetes.api.model.ObjectReference targetRef, String zone) { + public Endpoint(List addresses, EndpointConditions conditions, Map deprecatedTopology, EndpointHints hints, String hostname, String nodeName, ObjectReference targetRef, String zone) { super(); this.addresses = addresses; this.conditions = conditions; @@ -165,12 +166,12 @@ public void setNodeName(String nodeName) { } @JsonProperty("targetRef") - public io.fabric8.kubernetes.api.model.ObjectReference getTargetRef() { + public ObjectReference getTargetRef() { return targetRef; } @JsonProperty("targetRef") - public void setTargetRef(io.fabric8.kubernetes.api.model.ObjectReference targetRef) { + public void setTargetRef(ObjectReference targetRef) { this.targetRef = targetRef; } diff --git a/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/discovery/v1/EndpointSlice.java b/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/discovery/v1/EndpointSlice.java index c213062f72c..3e3f13b7110 100644 --- a/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/discovery/v1/EndpointSlice.java +++ b/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/discovery/v1/EndpointSlice.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), @@ -90,7 +91,7 @@ public class EndpointSlice implements Editable , HasMetada @JsonProperty("kind") private String kind = "EndpointSlice"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("ports") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List ports = new ArrayList<>(); @@ -104,7 +105,7 @@ public class EndpointSlice implements Editable , HasMetada public EndpointSlice() { } - public EndpointSlice(String addressType, String apiVersion, List endpoints, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, List ports) { + public EndpointSlice(String addressType, String apiVersion, List endpoints, String kind, ObjectMeta metadata, List ports) { super(); this.addressType = addressType; this.apiVersion = apiVersion; @@ -176,12 +177,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-discovery/src/generated/java/io/fabric8/kubernetes/api/model/discovery/v1beta1/Endpoint.java b/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/discovery/v1beta1/Endpoint.java index 92aab3edc93..a6242e6f8ff 100644 --- a/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/discovery/v1beta1/Endpoint.java +++ b/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/discovery/v1beta1/Endpoint.java @@ -20,6 +20,7 @@ import io.fabric8.kubernetes.api.model.LabelSelector; import io.fabric8.kubernetes.api.model.LocalObjectReference; import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.ResourceRequirements; @@ -53,7 +54,7 @@ @BuildableReference(PodTemplateSpec.class), @BuildableReference(ResourceRequirements.class), @BuildableReference(IntOrString.class), - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class), + @BuildableReference(ObjectReference.class), @BuildableReference(LocalObjectReference.class), @BuildableReference(PersistentVolumeClaim.class) }) @@ -73,7 +74,7 @@ public class Endpoint implements Editable , KubernetesResource @JsonProperty("nodeName") private String nodeName; @JsonProperty("targetRef") - private io.fabric8.kubernetes.api.model.ObjectReference targetRef; + private ObjectReference targetRef; @JsonProperty("topology") @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map topology = new LinkedHashMap<>(); @@ -87,7 +88,7 @@ public class Endpoint implements Editable , KubernetesResource public Endpoint() { } - public Endpoint(List addresses, EndpointConditions conditions, EndpointHints hints, String hostname, String nodeName, io.fabric8.kubernetes.api.model.ObjectReference targetRef, Map topology) { + public Endpoint(List addresses, EndpointConditions conditions, EndpointHints hints, String hostname, String nodeName, ObjectReference targetRef, Map topology) { super(); this.addresses = addresses; this.conditions = conditions; @@ -150,12 +151,12 @@ public void setNodeName(String nodeName) { } @JsonProperty("targetRef") - public io.fabric8.kubernetes.api.model.ObjectReference getTargetRef() { + public ObjectReference getTargetRef() { return targetRef; } @JsonProperty("targetRef") - public void setTargetRef(io.fabric8.kubernetes.api.model.ObjectReference targetRef) { + public void setTargetRef(ObjectReference targetRef) { this.targetRef = targetRef; } diff --git a/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/discovery/v1beta1/EndpointSlice.java b/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/discovery/v1beta1/EndpointSlice.java index 3412d5cd5cf..b63f309f304 100644 --- a/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/discovery/v1beta1/EndpointSlice.java +++ b/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/discovery/v1beta1/EndpointSlice.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), @@ -90,7 +91,7 @@ public class EndpointSlice implements Editable , HasMetada @JsonProperty("kind") private String kind = "EndpointSlice"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("ports") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List ports = new ArrayList<>(); @@ -104,7 +105,7 @@ public class EndpointSlice implements Editable , HasMetada public EndpointSlice() { } - public EndpointSlice(String addressType, String apiVersion, List endpoints, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, List ports) { + public EndpointSlice(String addressType, String apiVersion, List endpoints, String kind, ObjectMeta metadata, List ports) { super(); this.addressType = addressType; this.apiVersion = apiVersion; @@ -176,12 +177,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/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 64554167002..0166f5b5338 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,18 +45,6 @@ void setUp() { .generateJavadoc(false); } - @Test - void discovery() { - 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\\.discovery\\..*$") - .packageMapping("io.k8s.api.discovery", "io.fabric8.kubernetes.api.model.discovery") - .build()) - .generate(); - } - @Test void events() { new ModelGenerator(baseSettings