diff --git a/Makefile b/Makefile index 7a8a4cfa917..62d5fd32c60 100644 --- a/Makefile +++ b/Makefile @@ -39,6 +39,7 @@ generate-openapi-classes: cd kubernetes-model-generator/kubernetes-model-admissionregistration && mvn -Pgenerate clean install cd kubernetes-model-generator/kubernetes-model-apiextensions && mvn -Pgenerate clean install cd kubernetes-model-generator/kubernetes-model-apps && mvn -Pgenerate clean install + cd kubernetes-model-generator/kubernetes-model-autoscaling && 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 a79dfcaab39..bc035b7a579 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-autoscaling" "kubernetes-model-batch" "kubernetes-model-certificates" "kubernetes-model-coordination" diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/pom.xml b/kubernetes-model-generator/kubernetes-model-admissionregistration/pom.xml index dbf210124ca..e85b3df2b02 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/pom.xml +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/pom.xml @@ -46,10 +46,6 @@ io.fabric8 kubernetes-model-core - - io.fabric8 - kubernetes-model-common - org.assertj assertj-core diff --git a/kubernetes-model-generator/kubernetes-model-apiextensions/pom.xml b/kubernetes-model-generator/kubernetes-model-apiextensions/pom.xml index 7d35bddb91f..d21ca5c9fce 100644 --- a/kubernetes-model-generator/kubernetes-model-apiextensions/pom.xml +++ b/kubernetes-model-generator/kubernetes-model-apiextensions/pom.xml @@ -41,10 +41,6 @@ io.fabric8 kubernetes-model-core - - io.fabric8 - kubernetes-model-common - org.assertj assertj-core diff --git a/kubernetes-model-generator/kubernetes-model-apps/pom.xml b/kubernetes-model-generator/kubernetes-model-apps/pom.xml index dca66b2ae1c..acf7cc1f31a 100644 --- a/kubernetes-model-generator/kubernetes-model-apps/pom.xml +++ b/kubernetes-model-generator/kubernetes-model-apps/pom.xml @@ -41,10 +41,6 @@ io.fabric8 kubernetes-model-core - - io.fabric8 - kubernetes-model-common - diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/Makefile b/kubernetes-model-generator/kubernetes-model-autoscaling/Makefile deleted file mode 100644 index c09a7003874..00000000000 --- a/kubernetes-model-generator/kubernetes-model-autoscaling/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-autoscaling/cmd/generate/generate.go b/kubernetes-model-generator/kubernetes-model-autoscaling/cmd/generate/generate.go deleted file mode 100644 index 53ec28c7904..00000000000 --- a/kubernetes-model-generator/kubernetes-model-autoscaling/cmd/generate/generate.go +++ /dev/null @@ -1,114 +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" - - autoscalingapiv2 "k8s.io/api/autoscaling/v2" - autoscalingapiv1 "k8s.io/api/autoscaling/v1" - autoscalingapiv2beta1 "k8s.io/api/autoscaling/v2beta1" - autoscalingapiv2beta2 "k8s.io/api/autoscaling/v2beta2" - - "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 - - Scale autoscalingapiv1.Scale - V2HorizontalPodAutoscaler autoscalingapiv2.HorizontalPodAutoscaler - V2HorizontalPodAutoscalerList autoscalingapiv2.HorizontalPodAutoscalerList - V1HorizontalPodAutoscaler autoscalingapiv1.HorizontalPodAutoscaler - V1HorizontalPodAutoscalerList autoscalingapiv1.HorizontalPodAutoscalerList - V2beta1HorizontalPodAutoscaler autoscalingapiv2beta1.HorizontalPodAutoscaler - V2beta1HorizontalPodAutoscalerList autoscalingapiv2beta1.HorizontalPodAutoscalerList - V2beta2HorizontalPodAutoscaler autoscalingapiv2beta2.HorizontalPodAutoscaler - V2beta2HorizontalPodAutoscalerList autoscalingapiv2beta2.HorizontalPodAutoscalerList -} - -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/apimachinery/pkg/api/resource", "", "io.fabric8.kubernetes.api.model", "kubernetes_resource_", false}, - {"k8s.io/api/autoscaling/v2beta2", "autoscaling", "io.fabric8.kubernetes.api.model.autoscaling.v2beta2", "kubernetes_autoscaling_v2beta2_", true}, - {"k8s.io/api/autoscaling/v2beta1", "autoscaling", "io.fabric8.kubernetes.api.model.autoscaling.v2beta1", "kubernetes_autoscaling_v2beta1_", true}, - {"k8s.io/api/autoscaling/v1", "autoscaling", "io.fabric8.kubernetes.api.model.autoscaling.v1", "kubernetes_autoscaling_v1_", true}, - {"k8s.io/api/autoscaling/v2", "autoscaling", "io.fabric8.kubernetes.api.model.autoscaling.v2", "kubernetes_autoscaling_v2_", 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{},"autoscaling") - 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-autoscaling/pom.xml b/kubernetes-model-generator/kubernetes-model-autoscaling/pom.xml index d08b0d08482..1fc98f061ff 100644 --- a/kubernetes-model-generator/kubernetes-model-autoscaling/pom.xml +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/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.autoscaling + + + ^io\.k8s\.api\.autoscaling\..*$ + + + diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java deleted file mode 100644 index 4330afbce57..00000000000 --- a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ /dev/null @@ -1,357 +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.autoscaling.v1.Scale; -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 ListOptions listOptions; - private ObjectMeta objectMeta; - private Patch patch; - private PatchOptions patchOptions; - private Quantity quantity; - private RootPaths rootPaths; - private Scale scale; - private Status status; - private String time; - private TypeMeta typeMeta; - private UpdateOptions updateOptions; - private io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscaler v1HorizontalPodAutoscaler; - private io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerList v1HorizontalPodAutoscalerList; - private io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscaler v2HorizontalPodAutoscaler; - private io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerList v2HorizontalPodAutoscalerList; - private io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscaler v2beta1HorizontalPodAutoscaler; - private io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscalerList v2beta1HorizontalPodAutoscalerList; - private io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscaler v2beta2HorizontalPodAutoscaler; - private io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscalerList v2beta2HorizontalPodAutoscalerList; - @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, ListOptions listOptions, ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Scale scale, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscaler v1HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerList v1HorizontalPodAutoscalerList, io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscaler v2HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerList v2HorizontalPodAutoscalerList, io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscaler v2beta1HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscalerList v2beta1HorizontalPodAutoscalerList, io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscaler v2beta2HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscalerList v2beta2HorizontalPodAutoscalerList) { - super(); - this.aPIGroup = aPIGroup; - this.aPIGroupList = aPIGroupList; - this.baseKubernetesList = baseKubernetesList; - this.createOptions = createOptions; - this.deleteOptions = deleteOptions; - this.getOptions = getOptions; - this.info = info; - this.listOptions = listOptions; - this.objectMeta = objectMeta; - this.patch = patch; - this.patchOptions = patchOptions; - this.quantity = quantity; - this.rootPaths = rootPaths; - this.scale = scale; - this.status = status; - this.time = time; - this.typeMeta = typeMeta; - this.updateOptions = updateOptions; - this.v1HorizontalPodAutoscaler = v1HorizontalPodAutoscaler; - this.v1HorizontalPodAutoscalerList = v1HorizontalPodAutoscalerList; - this.v2HorizontalPodAutoscaler = v2HorizontalPodAutoscaler; - this.v2HorizontalPodAutoscalerList = v2HorizontalPodAutoscalerList; - this.v2beta1HorizontalPodAutoscaler = v2beta1HorizontalPodAutoscaler; - this.v2beta1HorizontalPodAutoscalerList = v2beta1HorizontalPodAutoscalerList; - this.v2beta2HorizontalPodAutoscaler = v2beta2HorizontalPodAutoscaler; - this.v2beta2HorizontalPodAutoscalerList = v2beta2HorizontalPodAutoscalerList; - } - - @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("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("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("Scale") - public Scale getScale() { - return scale; - } - - @JsonProperty("Scale") - public void setScale(Scale scale) { - this.scale = scale; - } - - @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("V1HorizontalPodAutoscaler") - public io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscaler getV1HorizontalPodAutoscaler() { - return v1HorizontalPodAutoscaler; - } - - @JsonProperty("V1HorizontalPodAutoscaler") - public void setV1HorizontalPodAutoscaler(io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscaler v1HorizontalPodAutoscaler) { - this.v1HorizontalPodAutoscaler = v1HorizontalPodAutoscaler; - } - - @JsonProperty("V1HorizontalPodAutoscalerList") - public io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerList getV1HorizontalPodAutoscalerList() { - return v1HorizontalPodAutoscalerList; - } - - @JsonProperty("V1HorizontalPodAutoscalerList") - public void setV1HorizontalPodAutoscalerList(io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerList v1HorizontalPodAutoscalerList) { - this.v1HorizontalPodAutoscalerList = v1HorizontalPodAutoscalerList; - } - - @JsonProperty("V2HorizontalPodAutoscaler") - public io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscaler getV2HorizontalPodAutoscaler() { - return v2HorizontalPodAutoscaler; - } - - @JsonProperty("V2HorizontalPodAutoscaler") - public void setV2HorizontalPodAutoscaler(io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscaler v2HorizontalPodAutoscaler) { - this.v2HorizontalPodAutoscaler = v2HorizontalPodAutoscaler; - } - - @JsonProperty("V2HorizontalPodAutoscalerList") - public io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerList getV2HorizontalPodAutoscalerList() { - return v2HorizontalPodAutoscalerList; - } - - @JsonProperty("V2HorizontalPodAutoscalerList") - public void setV2HorizontalPodAutoscalerList(io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerList v2HorizontalPodAutoscalerList) { - this.v2HorizontalPodAutoscalerList = v2HorizontalPodAutoscalerList; - } - - @JsonProperty("V2beta1HorizontalPodAutoscaler") - public io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscaler getV2beta1HorizontalPodAutoscaler() { - return v2beta1HorizontalPodAutoscaler; - } - - @JsonProperty("V2beta1HorizontalPodAutoscaler") - public void setV2beta1HorizontalPodAutoscaler(io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscaler v2beta1HorizontalPodAutoscaler) { - this.v2beta1HorizontalPodAutoscaler = v2beta1HorizontalPodAutoscaler; - } - - @JsonProperty("V2beta1HorizontalPodAutoscalerList") - public io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscalerList getV2beta1HorizontalPodAutoscalerList() { - return v2beta1HorizontalPodAutoscalerList; - } - - @JsonProperty("V2beta1HorizontalPodAutoscalerList") - public void setV2beta1HorizontalPodAutoscalerList(io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscalerList v2beta1HorizontalPodAutoscalerList) { - this.v2beta1HorizontalPodAutoscalerList = v2beta1HorizontalPodAutoscalerList; - } - - @JsonProperty("V2beta2HorizontalPodAutoscaler") - public io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscaler getV2beta2HorizontalPodAutoscaler() { - return v2beta2HorizontalPodAutoscaler; - } - - @JsonProperty("V2beta2HorizontalPodAutoscaler") - public void setV2beta2HorizontalPodAutoscaler(io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscaler v2beta2HorizontalPodAutoscaler) { - this.v2beta2HorizontalPodAutoscaler = v2beta2HorizontalPodAutoscaler; - } - - @JsonProperty("V2beta2HorizontalPodAutoscalerList") - public io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscalerList getV2beta2HorizontalPodAutoscalerList() { - return v2beta2HorizontalPodAutoscalerList; - } - - @JsonProperty("V2beta2HorizontalPodAutoscalerList") - public void setV2beta2HorizontalPodAutoscalerList(io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscalerList v2beta2HorizontalPodAutoscalerList) { - this.v2beta2HorizontalPodAutoscalerList = v2beta2HorizontalPodAutoscalerList; - } - - @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-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java deleted file mode 100644 index e1d65f11205..00000000000 --- a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ /dev/null @@ -1,357 +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.autoscaling.v1.Scale; -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 ListOptions listOptions; - private ObjectMeta objectMeta; - private Patch patch; - private PatchOptions patchOptions; - private Quantity quantity; - private RootPaths rootPaths; - private Scale scale; - private Status status; - private String time; - private TypeMeta typeMeta; - private UpdateOptions updateOptions; - private io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscaler v1HorizontalPodAutoscaler; - private io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerList v1HorizontalPodAutoscalerList; - private io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscaler v2HorizontalPodAutoscaler; - private io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerList v2HorizontalPodAutoscalerList; - private io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscaler v2beta1HorizontalPodAutoscaler; - private io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscalerList v2beta1HorizontalPodAutoscalerList; - private io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscaler v2beta2HorizontalPodAutoscaler; - private io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscalerList v2beta2HorizontalPodAutoscalerList; - @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, ListOptions listOptions, ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Scale scale, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscaler v1HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerList v1HorizontalPodAutoscalerList, io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscaler v2HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerList v2HorizontalPodAutoscalerList, io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscaler v2beta1HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscalerList v2beta1HorizontalPodAutoscalerList, io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscaler v2beta2HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscalerList v2beta2HorizontalPodAutoscalerList) { - super(); - this.aPIGroup = aPIGroup; - this.aPIGroupList = aPIGroupList; - this.baseKubernetesList = baseKubernetesList; - this.createOptions = createOptions; - this.deleteOptions = deleteOptions; - this.getOptions = getOptions; - this.info = info; - this.listOptions = listOptions; - this.objectMeta = objectMeta; - this.patch = patch; - this.patchOptions = patchOptions; - this.quantity = quantity; - this.rootPaths = rootPaths; - this.scale = scale; - this.status = status; - this.time = time; - this.typeMeta = typeMeta; - this.updateOptions = updateOptions; - this.v1HorizontalPodAutoscaler = v1HorizontalPodAutoscaler; - this.v1HorizontalPodAutoscalerList = v1HorizontalPodAutoscalerList; - this.v2HorizontalPodAutoscaler = v2HorizontalPodAutoscaler; - this.v2HorizontalPodAutoscalerList = v2HorizontalPodAutoscalerList; - this.v2beta1HorizontalPodAutoscaler = v2beta1HorizontalPodAutoscaler; - this.v2beta1HorizontalPodAutoscalerList = v2beta1HorizontalPodAutoscalerList; - this.v2beta2HorizontalPodAutoscaler = v2beta2HorizontalPodAutoscaler; - this.v2beta2HorizontalPodAutoscalerList = v2beta2HorizontalPodAutoscalerList; - } - - @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("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("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("Scale") - public Scale getScale() { - return scale; - } - - @JsonProperty("Scale") - public void setScale(Scale scale) { - this.scale = scale; - } - - @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("V1HorizontalPodAutoscaler") - public io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscaler getV1HorizontalPodAutoscaler() { - return v1HorizontalPodAutoscaler; - } - - @JsonProperty("V1HorizontalPodAutoscaler") - public void setV1HorizontalPodAutoscaler(io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscaler v1HorizontalPodAutoscaler) { - this.v1HorizontalPodAutoscaler = v1HorizontalPodAutoscaler; - } - - @JsonProperty("V1HorizontalPodAutoscalerList") - public io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerList getV1HorizontalPodAutoscalerList() { - return v1HorizontalPodAutoscalerList; - } - - @JsonProperty("V1HorizontalPodAutoscalerList") - public void setV1HorizontalPodAutoscalerList(io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerList v1HorizontalPodAutoscalerList) { - this.v1HorizontalPodAutoscalerList = v1HorizontalPodAutoscalerList; - } - - @JsonProperty("V2HorizontalPodAutoscaler") - public io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscaler getV2HorizontalPodAutoscaler() { - return v2HorizontalPodAutoscaler; - } - - @JsonProperty("V2HorizontalPodAutoscaler") - public void setV2HorizontalPodAutoscaler(io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscaler v2HorizontalPodAutoscaler) { - this.v2HorizontalPodAutoscaler = v2HorizontalPodAutoscaler; - } - - @JsonProperty("V2HorizontalPodAutoscalerList") - public io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerList getV2HorizontalPodAutoscalerList() { - return v2HorizontalPodAutoscalerList; - } - - @JsonProperty("V2HorizontalPodAutoscalerList") - public void setV2HorizontalPodAutoscalerList(io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerList v2HorizontalPodAutoscalerList) { - this.v2HorizontalPodAutoscalerList = v2HorizontalPodAutoscalerList; - } - - @JsonProperty("V2beta1HorizontalPodAutoscaler") - public io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscaler getV2beta1HorizontalPodAutoscaler() { - return v2beta1HorizontalPodAutoscaler; - } - - @JsonProperty("V2beta1HorizontalPodAutoscaler") - public void setV2beta1HorizontalPodAutoscaler(io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscaler v2beta1HorizontalPodAutoscaler) { - this.v2beta1HorizontalPodAutoscaler = v2beta1HorizontalPodAutoscaler; - } - - @JsonProperty("V2beta1HorizontalPodAutoscalerList") - public io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscalerList getV2beta1HorizontalPodAutoscalerList() { - return v2beta1HorizontalPodAutoscalerList; - } - - @JsonProperty("V2beta1HorizontalPodAutoscalerList") - public void setV2beta1HorizontalPodAutoscalerList(io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscalerList v2beta1HorizontalPodAutoscalerList) { - this.v2beta1HorizontalPodAutoscalerList = v2beta1HorizontalPodAutoscalerList; - } - - @JsonProperty("V2beta2HorizontalPodAutoscaler") - public io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscaler getV2beta2HorizontalPodAutoscaler() { - return v2beta2HorizontalPodAutoscaler; - } - - @JsonProperty("V2beta2HorizontalPodAutoscaler") - public void setV2beta2HorizontalPodAutoscaler(io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscaler v2beta2HorizontalPodAutoscaler) { - this.v2beta2HorizontalPodAutoscaler = v2beta2HorizontalPodAutoscaler; - } - - @JsonProperty("V2beta2HorizontalPodAutoscalerList") - public io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscalerList getV2beta2HorizontalPodAutoscalerList() { - return v2beta2HorizontalPodAutoscalerList; - } - - @JsonProperty("V2beta2HorizontalPodAutoscalerList") - public void setV2beta2HorizontalPodAutoscalerList(io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscalerList v2beta2HorizontalPodAutoscalerList) { - this.v2beta2HorizontalPodAutoscalerList = v2beta2HorizontalPodAutoscalerList; - } - - @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-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v1/HorizontalPodAutoscaler.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v1/HorizontalPodAutoscaler.java index 7dc8f5f21cd..7d46b635a6d 100644 --- a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v1/HorizontalPodAutoscaler.java +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v1/HorizontalPodAutoscaler.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 HorizontalPodAutoscaler implements Editable , HasMetadata, Namespaced @JsonProperty("kind") private String kind = "Scale"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("spec") private ScaleSpec spec; @JsonProperty("status") @@ -97,7 +98,7 @@ public class Scale implements Editable , HasMetadata, Namespaced public Scale() { } - public Scale(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, ScaleSpec spec, ScaleStatus status) { + public Scale(String apiVersion, String kind, ObjectMeta metadata, ScaleSpec spec, ScaleStatus 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-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/HorizontalPodAutoscaler.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/HorizontalPodAutoscaler.java index d1240de6a05..edc6ca86571 100644 --- a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/HorizontalPodAutoscaler.java +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/HorizontalPodAutoscaler.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 HorizontalPodAutoscaler implements Editable , Kub @JsonProperty("name") private String name; @JsonProperty("selector") - private io.fabric8.kubernetes.api.model.LabelSelector selector; + private LabelSelector selector; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -68,7 +69,7 @@ public class MetricIdentifier implements Editable , Kub public MetricIdentifier() { } - public MetricIdentifier(String name, io.fabric8.kubernetes.api.model.LabelSelector selector) { + public MetricIdentifier(String name, LabelSelector selector) { super(); this.name = name; this.selector = selector; @@ -85,12 +86,12 @@ public void setName(String name) { } @JsonProperty("selector") - public io.fabric8.kubernetes.api.model.LabelSelector getSelector() { + public LabelSelector getSelector() { return selector; } @JsonProperty("selector") - public void setSelector(io.fabric8.kubernetes.api.model.LabelSelector selector) { + public void setSelector(LabelSelector selector) { this.selector = selector; } diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2beta1/ExternalMetricSource.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2beta1/ExternalMetricSource.java index 6a41a6c3419..10e63fa7661 100644 --- a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2beta1/ExternalMetricSource.java +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2beta1/ExternalMetricSource.java @@ -15,6 +15,7 @@ import io.fabric8.kubernetes.api.model.Container; import io.fabric8.kubernetes.api.model.IntOrString; import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; import io.fabric8.kubernetes.api.model.LocalObjectReference; import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; @@ -44,7 +45,7 @@ }) @Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { @BuildableReference(ObjectMeta.class), - @BuildableReference(io.fabric8.kubernetes.api.model.LabelSelector.class), + @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @BuildableReference(ResourceRequirements.class), @@ -60,7 +61,7 @@ public class ExternalMetricSource implements Editable additionalProperties = new LinkedHashMap(); @@ -75,7 +76,7 @@ public class ExternalMetricStatus implements Editable , @JsonProperty("metricName") private String metricName; @JsonProperty("selector") - private io.fabric8.kubernetes.api.model.LabelSelector selector; + private LabelSelector selector; @JsonProperty("target") private CrossVersionObjectReference target; @JsonProperty("targetValue") @@ -78,7 +79,7 @@ public class ObjectMetricSource implements Editable , public ObjectMetricSource() { } - public ObjectMetricSource(Quantity averageValue, String metricName, io.fabric8.kubernetes.api.model.LabelSelector selector, CrossVersionObjectReference target, Quantity targetValue) { + public ObjectMetricSource(Quantity averageValue, String metricName, LabelSelector selector, CrossVersionObjectReference target, Quantity targetValue) { super(); this.averageValue = averageValue; this.metricName = metricName; @@ -108,12 +109,12 @@ public void setMetricName(String metricName) { } @JsonProperty("selector") - public io.fabric8.kubernetes.api.model.LabelSelector getSelector() { + public LabelSelector getSelector() { return selector; } @JsonProperty("selector") - public void setSelector(io.fabric8.kubernetes.api.model.LabelSelector selector) { + public void setSelector(LabelSelector selector) { this.selector = selector; } diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2beta1/ObjectMetricStatus.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2beta1/ObjectMetricStatus.java index 00a4536267e..576156cb507 100644 --- a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2beta1/ObjectMetricStatus.java +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2beta1/ObjectMetricStatus.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; @@ -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 ObjectMetricStatus implements Editable , @JsonProperty("metricName") private String metricName; @JsonProperty("selector") - private io.fabric8.kubernetes.api.model.LabelSelector selector; + private LabelSelector selector; @JsonProperty("target") private CrossVersionObjectReference target; @JsonIgnore @@ -78,7 +79,7 @@ public class ObjectMetricStatus implements Editable , public ObjectMetricStatus() { } - public ObjectMetricStatus(Quantity averageValue, Quantity currentValue, String metricName, io.fabric8.kubernetes.api.model.LabelSelector selector, CrossVersionObjectReference target) { + public ObjectMetricStatus(Quantity averageValue, Quantity currentValue, String metricName, LabelSelector selector, CrossVersionObjectReference target) { super(); this.averageValue = averageValue; this.currentValue = currentValue; @@ -118,12 +119,12 @@ public void setMetricName(String metricName) { } @JsonProperty("selector") - public io.fabric8.kubernetes.api.model.LabelSelector getSelector() { + public LabelSelector getSelector() { return selector; } @JsonProperty("selector") - public void setSelector(io.fabric8.kubernetes.api.model.LabelSelector selector) { + public void setSelector(LabelSelector selector) { this.selector = selector; } diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2beta1/PodsMetricSource.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2beta1/PodsMetricSource.java index 83f14e020e1..9b6ef01cef6 100644 --- a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2beta1/PodsMetricSource.java +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2beta1/PodsMetricSource.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; @@ -43,7 +44,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), @@ -59,7 +60,7 @@ public class PodsMetricSource implements Editable , Kub @JsonProperty("metricName") private String metricName; @JsonProperty("selector") - private io.fabric8.kubernetes.api.model.LabelSelector selector; + private LabelSelector selector; @JsonProperty("targetAverageValue") private Quantity targetAverageValue; @JsonIgnore @@ -72,7 +73,7 @@ public class PodsMetricSource implements Editable , Kub public PodsMetricSource() { } - public PodsMetricSource(String metricName, io.fabric8.kubernetes.api.model.LabelSelector selector, Quantity targetAverageValue) { + public PodsMetricSource(String metricName, LabelSelector selector, Quantity targetAverageValue) { super(); this.metricName = metricName; this.selector = selector; @@ -90,12 +91,12 @@ public void setMetricName(String metricName) { } @JsonProperty("selector") - public io.fabric8.kubernetes.api.model.LabelSelector getSelector() { + public LabelSelector getSelector() { return selector; } @JsonProperty("selector") - public void setSelector(io.fabric8.kubernetes.api.model.LabelSelector selector) { + public void setSelector(LabelSelector selector) { this.selector = selector; } diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2beta1/PodsMetricStatus.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2beta1/PodsMetricStatus.java index f4fc8b17fd1..a2ccd3f65f4 100644 --- a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2beta1/PodsMetricStatus.java +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2beta1/PodsMetricStatus.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; @@ -43,7 +44,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), @@ -61,7 +62,7 @@ public class PodsMetricStatus implements Editable , Kub @JsonProperty("metricName") private String metricName; @JsonProperty("selector") - private io.fabric8.kubernetes.api.model.LabelSelector selector; + private LabelSelector selector; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -72,7 +73,7 @@ public class PodsMetricStatus implements Editable , Kub public PodsMetricStatus() { } - public PodsMetricStatus(Quantity currentAverageValue, String metricName, io.fabric8.kubernetes.api.model.LabelSelector selector) { + public PodsMetricStatus(Quantity currentAverageValue, String metricName, LabelSelector selector) { super(); this.currentAverageValue = currentAverageValue; this.metricName = metricName; @@ -100,12 +101,12 @@ public void setMetricName(String metricName) { } @JsonProperty("selector") - public io.fabric8.kubernetes.api.model.LabelSelector getSelector() { + public LabelSelector getSelector() { return selector; } @JsonProperty("selector") - public void setSelector(io.fabric8.kubernetes.api.model.LabelSelector selector) { + public void setSelector(LabelSelector selector) { this.selector = selector; } diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2beta2/HorizontalPodAutoscaler.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2beta2/HorizontalPodAutoscaler.java index 850ebbc1823..49edc13eaea 100644 --- a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2beta2/HorizontalPodAutoscaler.java +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2beta2/HorizontalPodAutoscaler.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 HorizontalPodAutoscaler implements Editable , Kub @JsonProperty("name") private String name; @JsonProperty("selector") - private io.fabric8.kubernetes.api.model.LabelSelector selector; + private LabelSelector selector; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -68,7 +69,7 @@ public class MetricIdentifier implements Editable , Kub public MetricIdentifier() { } - public MetricIdentifier(String name, io.fabric8.kubernetes.api.model.LabelSelector selector) { + public MetricIdentifier(String name, LabelSelector selector) { super(); this.name = name; this.selector = selector; @@ -85,12 +86,12 @@ public void setName(String name) { } @JsonProperty("selector") - public io.fabric8.kubernetes.api.model.LabelSelector getSelector() { + public LabelSelector getSelector() { return selector; } @JsonProperty("selector") - public void setSelector(io.fabric8.kubernetes.api.model.LabelSelector selector) { + public void setSelector(LabelSelector selector) { this.selector = selector; } diff --git a/kubernetes-model-generator/kubernetes-model-rbac/pom.xml b/kubernetes-model-generator/kubernetes-model-rbac/pom.xml index 9ee4eab152e..c813f193f8c 100644 --- a/kubernetes-model-generator/kubernetes-model-rbac/pom.xml +++ b/kubernetes-model-generator/kubernetes-model-rbac/pom.xml @@ -43,10 +43,6 @@ io.fabric8 kubernetes-model-core - - io.fabric8 - kubernetes-model-common - 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 ba99a4e107e..f4750ed710a 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,15 +45,6 @@ void setUp() { .generateJavadoc(false); } - @Test - void apps() { - new ModelGenerator(baseSettings - .includeGenerationRegex("^io\\.k8s\\.api\\.apps\\..*$") - .packageMapping("io.k8s.api.apps.v1", "io.fabric8.kubernetes.api.model.apps") - .build()) - .generate(); - } - @Test void autoscaling() { new ModelGenerator(baseSettings