diff --git a/Makefile b/Makefile
index 4cf986a51f5..e131e34b8b1 100644
--- a/Makefile
+++ b/Makefile
@@ -46,6 +46,7 @@ generate-openapi-classes:
cd kubernetes-model-generator/kubernetes-model-discovery && mvn -Pgenerate clean install
cd kubernetes-model-generator/kubernetes-model-events && mvn -Pgenerate clean install
cd kubernetes-model-generator/kubernetes-model-extensions && mvn -Pgenerate clean install
+ cd kubernetes-model-generator/kubernetes-model-flowcontrol && 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 b03f8eb8cbc..969862f8469 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-flowcontrol"
"kubernetes-model-gatewayapi"
"kubernetes-model-networking"
"kubernetes-model-metrics"
diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/Makefile b/kubernetes-model-generator/kubernetes-model-flowcontrol/Makefile
deleted file mode 100644
index c09a7003874..00000000000
--- a/kubernetes-model-generator/kubernetes-model-flowcontrol/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-flowcontrol/cmd/generate/generate.go b/kubernetes-model-generator/kubernetes-model-flowcontrol/cmd/generate/generate.go
deleted file mode 100644
index 9f6e9b0cbad..00000000000
--- a/kubernetes-model-generator/kubernetes-model-flowcontrol/cmd/generate/generate.go
+++ /dev/null
@@ -1,104 +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"
-
- flowcontrolv1 "k8s.io/api/flowcontrol/v1"
- flowcontrolv1beta1 "k8s.io/api/flowcontrol/v1beta1"
- flowcontrolv1beta2 "k8s.io/api/flowcontrol/v1beta2"
- flowcontrolv1beta3 "k8s.io/api/flowcontrol/v1beta3"
- apiserverinternalv1alpha1 "k8s.io/api/apiserverinternal/v1alpha1"
-
-
- "log"
- "reflect"
- "strings"
- "time"
-
- "os"
-
- "github.com/fabric8io/kubernetes-client/kubernetes-model-generator/pkg/schemagen"
-)
-
-type Schema struct {
- V1FlowSchema flowcontrolv1.FlowSchema
- V1FlowSchemaList flowcontrolv1.FlowSchemaList
- V1PriorityLevelConfiguration flowcontrolv1.PriorityLevelConfiguration
- V1PriorityLevelConfigurationList flowcontrolv1.PriorityLevelConfigurationList
- V1beta1FlowSchema flowcontrolv1beta1.FlowSchema
- V1beta1FlowSchemaList flowcontrolv1beta1.FlowSchemaList
- V1beta1PriorityLevelConfiguration flowcontrolv1beta1.PriorityLevelConfiguration
- V1beta1PriorityLevelConfigurationList flowcontrolv1beta1.PriorityLevelConfigurationList
- V1beta2FlowSchema flowcontrolv1beta2.FlowSchema
- V1beta2FlowSchemaList flowcontrolv1beta2.FlowSchemaList
- V1beta2PriorityLevelConfiguration flowcontrolv1beta2.PriorityLevelConfiguration
- V1beta2PriorityLevelConfigurationList flowcontrolv1beta2.PriorityLevelConfigurationList
- V1beta3FlowSchema flowcontrolv1beta3.FlowSchema
- V1beta3FlowSchemaList flowcontrolv1beta3.FlowSchemaList
- V1beta3PriorityLevelConfiguration flowcontrolv1beta3.PriorityLevelConfiguration
- V1beta3PriorityLevelConfigurationList flowcontrolv1beta3.PriorityLevelConfigurationList
- V1Alpha1StorageVersion apiserverinternalv1alpha1.StorageVersion
- V1Alpha1StorageVersionList apiserverinternalv1alpha1.StorageVersionList
-}
-
-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/flowcontrol/v1beta1", "flowcontrol.apiserver.k8s.io", "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1", "kubernetes_flowcontrol_v1beta1_", true},
- {"k8s.io/api/flowcontrol/v1beta2", "flowcontrol.apiserver.k8s.io", "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2", "kubernetes_flowcontrol_v1beta2_", true},
- {"k8s.io/api/flowcontrol/v1beta3", "flowcontrol.apiserver.k8s.io", "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3", "kubernetes_flowcontrol_v1beta3_", true},
- {"k8s.io/api/flowcontrol/v1", "flowcontrol.apiserver.k8s.io", "io.fabric8.kubernetes.api.model.flowcontrol.v1", "kubernetes_flowcontrol_v1_", true},
- {"k8s.io/api/apiserverinternal/v1alpha1", "internal.apiserver.k8s.io", "io.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1", "kubernetes_internal_apiserver_v1alpha1_", true},
- }
-
- typeMap := map[reflect.Type]reflect.Type{
- reflect.TypeOf(time.Time{}): reflect.TypeOf(""),
- reflect.TypeOf(struct{}{}): reflect.TypeOf(""),
- }
- schema, err := schemagen.GenerateSchema(reflect.TypeOf(Schema{}), packages, typeMap, map[reflect.Type]string{},"flowcontrol")
- 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-flowcontrol/pom.xml b/kubernetes-model-generator/kubernetes-model-flowcontrol/pom.xml
index 669e5815d9e..b40f448bfee 100644
--- a/kubernetes-model-generator/kubernetes-model-flowcontrol/pom.xml
+++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/pom.xml
@@ -44,10 +44,6 @@
io.fabric8
kubernetes-model-core
-
- io.fabric8
- kubernetes-model-common
-
org.assertj
assertj-core
@@ -55,31 +51,29 @@
-
-
-
- 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
+ ${project.basedir}/../openapi/schemas/kubernetes-1.26.15.json
+ ${openapi.schema.kubernetes-latest}
+
+
+ io.fabric8.kubernetes.api.model.flowcontrol
+
+
+ ^io\.k8s\.api\.flowcontrol\..*$
+
+
+
diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java
deleted file mode 100644
index 2abf428f8be..00000000000
--- a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java
+++ /dev/null
@@ -1,261 +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.internal.apiserver.v1alpha1.StorageVersion;
-import io.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1.StorageVersionList;
-
-@Generated("jsonschema2pojo")
-public class KubeSchema {
-
- private StorageVersion v1Alpha1StorageVersion;
- private StorageVersionList v1Alpha1StorageVersionList;
- private io.fabric8.kubernetes.api.model.flowcontrol.v1.FlowSchema v1FlowSchema;
- private io.fabric8.kubernetes.api.model.flowcontrol.v1.FlowSchemaList v1FlowSchemaList;
- private io.fabric8.kubernetes.api.model.flowcontrol.v1.PriorityLevelConfiguration v1PriorityLevelConfiguration;
- private io.fabric8.kubernetes.api.model.flowcontrol.v1.PriorityLevelConfigurationList v1PriorityLevelConfigurationList;
- private io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchema v1beta1FlowSchema;
- private io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchemaList v1beta1FlowSchemaList;
- private io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfiguration v1beta1PriorityLevelConfiguration;
- private io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfigurationList v1beta1PriorityLevelConfigurationList;
- private io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchema v1beta2FlowSchema;
- private io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchemaList v1beta2FlowSchemaList;
- private io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfiguration v1beta2PriorityLevelConfiguration;
- private io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationList v1beta2PriorityLevelConfigurationList;
- private io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.FlowSchema v1beta3FlowSchema;
- private io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.FlowSchemaList v1beta3FlowSchemaList;
- private io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.PriorityLevelConfiguration v1beta3PriorityLevelConfiguration;
- private io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.PriorityLevelConfigurationList v1beta3PriorityLevelConfigurationList;
- @JsonIgnore
- private Map additionalProperties = new LinkedHashMap();
-
- /**
- * No args constructor for use in serialization
- *
- */
- public KubeSchema() {
- }
-
- public KubeSchema(StorageVersion v1Alpha1StorageVersion, StorageVersionList v1Alpha1StorageVersionList, io.fabric8.kubernetes.api.model.flowcontrol.v1.FlowSchema v1FlowSchema, io.fabric8.kubernetes.api.model.flowcontrol.v1.FlowSchemaList v1FlowSchemaList, io.fabric8.kubernetes.api.model.flowcontrol.v1.PriorityLevelConfiguration v1PriorityLevelConfiguration, io.fabric8.kubernetes.api.model.flowcontrol.v1.PriorityLevelConfigurationList v1PriorityLevelConfigurationList, io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchema v1beta1FlowSchema, io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchemaList v1beta1FlowSchemaList, io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfiguration v1beta1PriorityLevelConfiguration, io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfigurationList v1beta1PriorityLevelConfigurationList, io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchema v1beta2FlowSchema, io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchemaList v1beta2FlowSchemaList, io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfiguration v1beta2PriorityLevelConfiguration, io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationList v1beta2PriorityLevelConfigurationList, io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.FlowSchema v1beta3FlowSchema, io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.FlowSchemaList v1beta3FlowSchemaList, io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.PriorityLevelConfiguration v1beta3PriorityLevelConfiguration, io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.PriorityLevelConfigurationList v1beta3PriorityLevelConfigurationList) {
- super();
- this.v1Alpha1StorageVersion = v1Alpha1StorageVersion;
- this.v1Alpha1StorageVersionList = v1Alpha1StorageVersionList;
- this.v1FlowSchema = v1FlowSchema;
- this.v1FlowSchemaList = v1FlowSchemaList;
- this.v1PriorityLevelConfiguration = v1PriorityLevelConfiguration;
- this.v1PriorityLevelConfigurationList = v1PriorityLevelConfigurationList;
- this.v1beta1FlowSchema = v1beta1FlowSchema;
- this.v1beta1FlowSchemaList = v1beta1FlowSchemaList;
- this.v1beta1PriorityLevelConfiguration = v1beta1PriorityLevelConfiguration;
- this.v1beta1PriorityLevelConfigurationList = v1beta1PriorityLevelConfigurationList;
- this.v1beta2FlowSchema = v1beta2FlowSchema;
- this.v1beta2FlowSchemaList = v1beta2FlowSchemaList;
- this.v1beta2PriorityLevelConfiguration = v1beta2PriorityLevelConfiguration;
- this.v1beta2PriorityLevelConfigurationList = v1beta2PriorityLevelConfigurationList;
- this.v1beta3FlowSchema = v1beta3FlowSchema;
- this.v1beta3FlowSchemaList = v1beta3FlowSchemaList;
- this.v1beta3PriorityLevelConfiguration = v1beta3PriorityLevelConfiguration;
- this.v1beta3PriorityLevelConfigurationList = v1beta3PriorityLevelConfigurationList;
- }
-
- @JsonProperty("V1Alpha1StorageVersion")
- public StorageVersion getV1Alpha1StorageVersion() {
- return v1Alpha1StorageVersion;
- }
-
- @JsonProperty("V1Alpha1StorageVersion")
- public void setV1Alpha1StorageVersion(StorageVersion v1Alpha1StorageVersion) {
- this.v1Alpha1StorageVersion = v1Alpha1StorageVersion;
- }
-
- @JsonProperty("V1Alpha1StorageVersionList")
- public StorageVersionList getV1Alpha1StorageVersionList() {
- return v1Alpha1StorageVersionList;
- }
-
- @JsonProperty("V1Alpha1StorageVersionList")
- public void setV1Alpha1StorageVersionList(StorageVersionList v1Alpha1StorageVersionList) {
- this.v1Alpha1StorageVersionList = v1Alpha1StorageVersionList;
- }
-
- @JsonProperty("V1FlowSchema")
- public io.fabric8.kubernetes.api.model.flowcontrol.v1.FlowSchema getV1FlowSchema() {
- return v1FlowSchema;
- }
-
- @JsonProperty("V1FlowSchema")
- public void setV1FlowSchema(io.fabric8.kubernetes.api.model.flowcontrol.v1.FlowSchema v1FlowSchema) {
- this.v1FlowSchema = v1FlowSchema;
- }
-
- @JsonProperty("V1FlowSchemaList")
- public io.fabric8.kubernetes.api.model.flowcontrol.v1.FlowSchemaList getV1FlowSchemaList() {
- return v1FlowSchemaList;
- }
-
- @JsonProperty("V1FlowSchemaList")
- public void setV1FlowSchemaList(io.fabric8.kubernetes.api.model.flowcontrol.v1.FlowSchemaList v1FlowSchemaList) {
- this.v1FlowSchemaList = v1FlowSchemaList;
- }
-
- @JsonProperty("V1PriorityLevelConfiguration")
- public io.fabric8.kubernetes.api.model.flowcontrol.v1.PriorityLevelConfiguration getV1PriorityLevelConfiguration() {
- return v1PriorityLevelConfiguration;
- }
-
- @JsonProperty("V1PriorityLevelConfiguration")
- public void setV1PriorityLevelConfiguration(io.fabric8.kubernetes.api.model.flowcontrol.v1.PriorityLevelConfiguration v1PriorityLevelConfiguration) {
- this.v1PriorityLevelConfiguration = v1PriorityLevelConfiguration;
- }
-
- @JsonProperty("V1PriorityLevelConfigurationList")
- public io.fabric8.kubernetes.api.model.flowcontrol.v1.PriorityLevelConfigurationList getV1PriorityLevelConfigurationList() {
- return v1PriorityLevelConfigurationList;
- }
-
- @JsonProperty("V1PriorityLevelConfigurationList")
- public void setV1PriorityLevelConfigurationList(io.fabric8.kubernetes.api.model.flowcontrol.v1.PriorityLevelConfigurationList v1PriorityLevelConfigurationList) {
- this.v1PriorityLevelConfigurationList = v1PriorityLevelConfigurationList;
- }
-
- @JsonProperty("V1beta1FlowSchema")
- public io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchema getV1beta1FlowSchema() {
- return v1beta1FlowSchema;
- }
-
- @JsonProperty("V1beta1FlowSchema")
- public void setV1beta1FlowSchema(io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchema v1beta1FlowSchema) {
- this.v1beta1FlowSchema = v1beta1FlowSchema;
- }
-
- @JsonProperty("V1beta1FlowSchemaList")
- public io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchemaList getV1beta1FlowSchemaList() {
- return v1beta1FlowSchemaList;
- }
-
- @JsonProperty("V1beta1FlowSchemaList")
- public void setV1beta1FlowSchemaList(io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchemaList v1beta1FlowSchemaList) {
- this.v1beta1FlowSchemaList = v1beta1FlowSchemaList;
- }
-
- @JsonProperty("V1beta1PriorityLevelConfiguration")
- public io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfiguration getV1beta1PriorityLevelConfiguration() {
- return v1beta1PriorityLevelConfiguration;
- }
-
- @JsonProperty("V1beta1PriorityLevelConfiguration")
- public void setV1beta1PriorityLevelConfiguration(io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfiguration v1beta1PriorityLevelConfiguration) {
- this.v1beta1PriorityLevelConfiguration = v1beta1PriorityLevelConfiguration;
- }
-
- @JsonProperty("V1beta1PriorityLevelConfigurationList")
- public io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfigurationList getV1beta1PriorityLevelConfigurationList() {
- return v1beta1PriorityLevelConfigurationList;
- }
-
- @JsonProperty("V1beta1PriorityLevelConfigurationList")
- public void setV1beta1PriorityLevelConfigurationList(io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfigurationList v1beta1PriorityLevelConfigurationList) {
- this.v1beta1PriorityLevelConfigurationList = v1beta1PriorityLevelConfigurationList;
- }
-
- @JsonProperty("V1beta2FlowSchema")
- public io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchema getV1beta2FlowSchema() {
- return v1beta2FlowSchema;
- }
-
- @JsonProperty("V1beta2FlowSchema")
- public void setV1beta2FlowSchema(io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchema v1beta2FlowSchema) {
- this.v1beta2FlowSchema = v1beta2FlowSchema;
- }
-
- @JsonProperty("V1beta2FlowSchemaList")
- public io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchemaList getV1beta2FlowSchemaList() {
- return v1beta2FlowSchemaList;
- }
-
- @JsonProperty("V1beta2FlowSchemaList")
- public void setV1beta2FlowSchemaList(io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchemaList v1beta2FlowSchemaList) {
- this.v1beta2FlowSchemaList = v1beta2FlowSchemaList;
- }
-
- @JsonProperty("V1beta2PriorityLevelConfiguration")
- public io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfiguration getV1beta2PriorityLevelConfiguration() {
- return v1beta2PriorityLevelConfiguration;
- }
-
- @JsonProperty("V1beta2PriorityLevelConfiguration")
- public void setV1beta2PriorityLevelConfiguration(io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfiguration v1beta2PriorityLevelConfiguration) {
- this.v1beta2PriorityLevelConfiguration = v1beta2PriorityLevelConfiguration;
- }
-
- @JsonProperty("V1beta2PriorityLevelConfigurationList")
- public io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationList getV1beta2PriorityLevelConfigurationList() {
- return v1beta2PriorityLevelConfigurationList;
- }
-
- @JsonProperty("V1beta2PriorityLevelConfigurationList")
- public void setV1beta2PriorityLevelConfigurationList(io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationList v1beta2PriorityLevelConfigurationList) {
- this.v1beta2PriorityLevelConfigurationList = v1beta2PriorityLevelConfigurationList;
- }
-
- @JsonProperty("V1beta3FlowSchema")
- public io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.FlowSchema getV1beta3FlowSchema() {
- return v1beta3FlowSchema;
- }
-
- @JsonProperty("V1beta3FlowSchema")
- public void setV1beta3FlowSchema(io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.FlowSchema v1beta3FlowSchema) {
- this.v1beta3FlowSchema = v1beta3FlowSchema;
- }
-
- @JsonProperty("V1beta3FlowSchemaList")
- public io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.FlowSchemaList getV1beta3FlowSchemaList() {
- return v1beta3FlowSchemaList;
- }
-
- @JsonProperty("V1beta3FlowSchemaList")
- public void setV1beta3FlowSchemaList(io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.FlowSchemaList v1beta3FlowSchemaList) {
- this.v1beta3FlowSchemaList = v1beta3FlowSchemaList;
- }
-
- @JsonProperty("V1beta3PriorityLevelConfiguration")
- public io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.PriorityLevelConfiguration getV1beta3PriorityLevelConfiguration() {
- return v1beta3PriorityLevelConfiguration;
- }
-
- @JsonProperty("V1beta3PriorityLevelConfiguration")
- public void setV1beta3PriorityLevelConfiguration(io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.PriorityLevelConfiguration v1beta3PriorityLevelConfiguration) {
- this.v1beta3PriorityLevelConfiguration = v1beta3PriorityLevelConfiguration;
- }
-
- @JsonProperty("V1beta3PriorityLevelConfigurationList")
- public io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.PriorityLevelConfigurationList getV1beta3PriorityLevelConfigurationList() {
- return v1beta3PriorityLevelConfigurationList;
- }
-
- @JsonProperty("V1beta3PriorityLevelConfigurationList")
- public void setV1beta3PriorityLevelConfigurationList(io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.PriorityLevelConfigurationList v1beta3PriorityLevelConfigurationList) {
- this.v1beta3PriorityLevelConfigurationList = v1beta3PriorityLevelConfigurationList;
- }
-
- @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-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java
deleted file mode 100644
index 0588e993cdb..00000000000
--- a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java
+++ /dev/null
@@ -1,261 +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.internal.apiserver.v1alpha1.StorageVersion;
-import io.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1.StorageVersionList;
-
-@Generated("jsonschema2pojo")
-public class ValidationSchema {
-
- private StorageVersion v1Alpha1StorageVersion;
- private StorageVersionList v1Alpha1StorageVersionList;
- private io.fabric8.kubernetes.api.model.flowcontrol.v1.FlowSchema v1FlowSchema;
- private io.fabric8.kubernetes.api.model.flowcontrol.v1.FlowSchemaList v1FlowSchemaList;
- private io.fabric8.kubernetes.api.model.flowcontrol.v1.PriorityLevelConfiguration v1PriorityLevelConfiguration;
- private io.fabric8.kubernetes.api.model.flowcontrol.v1.PriorityLevelConfigurationList v1PriorityLevelConfigurationList;
- private io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchema v1beta1FlowSchema;
- private io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchemaList v1beta1FlowSchemaList;
- private io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfiguration v1beta1PriorityLevelConfiguration;
- private io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfigurationList v1beta1PriorityLevelConfigurationList;
- private io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchema v1beta2FlowSchema;
- private io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchemaList v1beta2FlowSchemaList;
- private io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfiguration v1beta2PriorityLevelConfiguration;
- private io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationList v1beta2PriorityLevelConfigurationList;
- private io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.FlowSchema v1beta3FlowSchema;
- private io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.FlowSchemaList v1beta3FlowSchemaList;
- private io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.PriorityLevelConfiguration v1beta3PriorityLevelConfiguration;
- private io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.PriorityLevelConfigurationList v1beta3PriorityLevelConfigurationList;
- @JsonIgnore
- private Map additionalProperties = new LinkedHashMap();
-
- /**
- * No args constructor for use in serialization
- *
- */
- public ValidationSchema() {
- }
-
- public ValidationSchema(StorageVersion v1Alpha1StorageVersion, StorageVersionList v1Alpha1StorageVersionList, io.fabric8.kubernetes.api.model.flowcontrol.v1.FlowSchema v1FlowSchema, io.fabric8.kubernetes.api.model.flowcontrol.v1.FlowSchemaList v1FlowSchemaList, io.fabric8.kubernetes.api.model.flowcontrol.v1.PriorityLevelConfiguration v1PriorityLevelConfiguration, io.fabric8.kubernetes.api.model.flowcontrol.v1.PriorityLevelConfigurationList v1PriorityLevelConfigurationList, io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchema v1beta1FlowSchema, io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchemaList v1beta1FlowSchemaList, io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfiguration v1beta1PriorityLevelConfiguration, io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfigurationList v1beta1PriorityLevelConfigurationList, io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchema v1beta2FlowSchema, io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchemaList v1beta2FlowSchemaList, io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfiguration v1beta2PriorityLevelConfiguration, io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationList v1beta2PriorityLevelConfigurationList, io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.FlowSchema v1beta3FlowSchema, io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.FlowSchemaList v1beta3FlowSchemaList, io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.PriorityLevelConfiguration v1beta3PriorityLevelConfiguration, io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.PriorityLevelConfigurationList v1beta3PriorityLevelConfigurationList) {
- super();
- this.v1Alpha1StorageVersion = v1Alpha1StorageVersion;
- this.v1Alpha1StorageVersionList = v1Alpha1StorageVersionList;
- this.v1FlowSchema = v1FlowSchema;
- this.v1FlowSchemaList = v1FlowSchemaList;
- this.v1PriorityLevelConfiguration = v1PriorityLevelConfiguration;
- this.v1PriorityLevelConfigurationList = v1PriorityLevelConfigurationList;
- this.v1beta1FlowSchema = v1beta1FlowSchema;
- this.v1beta1FlowSchemaList = v1beta1FlowSchemaList;
- this.v1beta1PriorityLevelConfiguration = v1beta1PriorityLevelConfiguration;
- this.v1beta1PriorityLevelConfigurationList = v1beta1PriorityLevelConfigurationList;
- this.v1beta2FlowSchema = v1beta2FlowSchema;
- this.v1beta2FlowSchemaList = v1beta2FlowSchemaList;
- this.v1beta2PriorityLevelConfiguration = v1beta2PriorityLevelConfiguration;
- this.v1beta2PriorityLevelConfigurationList = v1beta2PriorityLevelConfigurationList;
- this.v1beta3FlowSchema = v1beta3FlowSchema;
- this.v1beta3FlowSchemaList = v1beta3FlowSchemaList;
- this.v1beta3PriorityLevelConfiguration = v1beta3PriorityLevelConfiguration;
- this.v1beta3PriorityLevelConfigurationList = v1beta3PriorityLevelConfigurationList;
- }
-
- @JsonProperty("V1Alpha1StorageVersion")
- public StorageVersion getV1Alpha1StorageVersion() {
- return v1Alpha1StorageVersion;
- }
-
- @JsonProperty("V1Alpha1StorageVersion")
- public void setV1Alpha1StorageVersion(StorageVersion v1Alpha1StorageVersion) {
- this.v1Alpha1StorageVersion = v1Alpha1StorageVersion;
- }
-
- @JsonProperty("V1Alpha1StorageVersionList")
- public StorageVersionList getV1Alpha1StorageVersionList() {
- return v1Alpha1StorageVersionList;
- }
-
- @JsonProperty("V1Alpha1StorageVersionList")
- public void setV1Alpha1StorageVersionList(StorageVersionList v1Alpha1StorageVersionList) {
- this.v1Alpha1StorageVersionList = v1Alpha1StorageVersionList;
- }
-
- @JsonProperty("V1FlowSchema")
- public io.fabric8.kubernetes.api.model.flowcontrol.v1.FlowSchema getV1FlowSchema() {
- return v1FlowSchema;
- }
-
- @JsonProperty("V1FlowSchema")
- public void setV1FlowSchema(io.fabric8.kubernetes.api.model.flowcontrol.v1.FlowSchema v1FlowSchema) {
- this.v1FlowSchema = v1FlowSchema;
- }
-
- @JsonProperty("V1FlowSchemaList")
- public io.fabric8.kubernetes.api.model.flowcontrol.v1.FlowSchemaList getV1FlowSchemaList() {
- return v1FlowSchemaList;
- }
-
- @JsonProperty("V1FlowSchemaList")
- public void setV1FlowSchemaList(io.fabric8.kubernetes.api.model.flowcontrol.v1.FlowSchemaList v1FlowSchemaList) {
- this.v1FlowSchemaList = v1FlowSchemaList;
- }
-
- @JsonProperty("V1PriorityLevelConfiguration")
- public io.fabric8.kubernetes.api.model.flowcontrol.v1.PriorityLevelConfiguration getV1PriorityLevelConfiguration() {
- return v1PriorityLevelConfiguration;
- }
-
- @JsonProperty("V1PriorityLevelConfiguration")
- public void setV1PriorityLevelConfiguration(io.fabric8.kubernetes.api.model.flowcontrol.v1.PriorityLevelConfiguration v1PriorityLevelConfiguration) {
- this.v1PriorityLevelConfiguration = v1PriorityLevelConfiguration;
- }
-
- @JsonProperty("V1PriorityLevelConfigurationList")
- public io.fabric8.kubernetes.api.model.flowcontrol.v1.PriorityLevelConfigurationList getV1PriorityLevelConfigurationList() {
- return v1PriorityLevelConfigurationList;
- }
-
- @JsonProperty("V1PriorityLevelConfigurationList")
- public void setV1PriorityLevelConfigurationList(io.fabric8.kubernetes.api.model.flowcontrol.v1.PriorityLevelConfigurationList v1PriorityLevelConfigurationList) {
- this.v1PriorityLevelConfigurationList = v1PriorityLevelConfigurationList;
- }
-
- @JsonProperty("V1beta1FlowSchema")
- public io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchema getV1beta1FlowSchema() {
- return v1beta1FlowSchema;
- }
-
- @JsonProperty("V1beta1FlowSchema")
- public void setV1beta1FlowSchema(io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchema v1beta1FlowSchema) {
- this.v1beta1FlowSchema = v1beta1FlowSchema;
- }
-
- @JsonProperty("V1beta1FlowSchemaList")
- public io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchemaList getV1beta1FlowSchemaList() {
- return v1beta1FlowSchemaList;
- }
-
- @JsonProperty("V1beta1FlowSchemaList")
- public void setV1beta1FlowSchemaList(io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchemaList v1beta1FlowSchemaList) {
- this.v1beta1FlowSchemaList = v1beta1FlowSchemaList;
- }
-
- @JsonProperty("V1beta1PriorityLevelConfiguration")
- public io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfiguration getV1beta1PriorityLevelConfiguration() {
- return v1beta1PriorityLevelConfiguration;
- }
-
- @JsonProperty("V1beta1PriorityLevelConfiguration")
- public void setV1beta1PriorityLevelConfiguration(io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfiguration v1beta1PriorityLevelConfiguration) {
- this.v1beta1PriorityLevelConfiguration = v1beta1PriorityLevelConfiguration;
- }
-
- @JsonProperty("V1beta1PriorityLevelConfigurationList")
- public io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfigurationList getV1beta1PriorityLevelConfigurationList() {
- return v1beta1PriorityLevelConfigurationList;
- }
-
- @JsonProperty("V1beta1PriorityLevelConfigurationList")
- public void setV1beta1PriorityLevelConfigurationList(io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfigurationList v1beta1PriorityLevelConfigurationList) {
- this.v1beta1PriorityLevelConfigurationList = v1beta1PriorityLevelConfigurationList;
- }
-
- @JsonProperty("V1beta2FlowSchema")
- public io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchema getV1beta2FlowSchema() {
- return v1beta2FlowSchema;
- }
-
- @JsonProperty("V1beta2FlowSchema")
- public void setV1beta2FlowSchema(io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchema v1beta2FlowSchema) {
- this.v1beta2FlowSchema = v1beta2FlowSchema;
- }
-
- @JsonProperty("V1beta2FlowSchemaList")
- public io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchemaList getV1beta2FlowSchemaList() {
- return v1beta2FlowSchemaList;
- }
-
- @JsonProperty("V1beta2FlowSchemaList")
- public void setV1beta2FlowSchemaList(io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchemaList v1beta2FlowSchemaList) {
- this.v1beta2FlowSchemaList = v1beta2FlowSchemaList;
- }
-
- @JsonProperty("V1beta2PriorityLevelConfiguration")
- public io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfiguration getV1beta2PriorityLevelConfiguration() {
- return v1beta2PriorityLevelConfiguration;
- }
-
- @JsonProperty("V1beta2PriorityLevelConfiguration")
- public void setV1beta2PriorityLevelConfiguration(io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfiguration v1beta2PriorityLevelConfiguration) {
- this.v1beta2PriorityLevelConfiguration = v1beta2PriorityLevelConfiguration;
- }
-
- @JsonProperty("V1beta2PriorityLevelConfigurationList")
- public io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationList getV1beta2PriorityLevelConfigurationList() {
- return v1beta2PriorityLevelConfigurationList;
- }
-
- @JsonProperty("V1beta2PriorityLevelConfigurationList")
- public void setV1beta2PriorityLevelConfigurationList(io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationList v1beta2PriorityLevelConfigurationList) {
- this.v1beta2PriorityLevelConfigurationList = v1beta2PriorityLevelConfigurationList;
- }
-
- @JsonProperty("V1beta3FlowSchema")
- public io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.FlowSchema getV1beta3FlowSchema() {
- return v1beta3FlowSchema;
- }
-
- @JsonProperty("V1beta3FlowSchema")
- public void setV1beta3FlowSchema(io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.FlowSchema v1beta3FlowSchema) {
- this.v1beta3FlowSchema = v1beta3FlowSchema;
- }
-
- @JsonProperty("V1beta3FlowSchemaList")
- public io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.FlowSchemaList getV1beta3FlowSchemaList() {
- return v1beta3FlowSchemaList;
- }
-
- @JsonProperty("V1beta3FlowSchemaList")
- public void setV1beta3FlowSchemaList(io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.FlowSchemaList v1beta3FlowSchemaList) {
- this.v1beta3FlowSchemaList = v1beta3FlowSchemaList;
- }
-
- @JsonProperty("V1beta3PriorityLevelConfiguration")
- public io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.PriorityLevelConfiguration getV1beta3PriorityLevelConfiguration() {
- return v1beta3PriorityLevelConfiguration;
- }
-
- @JsonProperty("V1beta3PriorityLevelConfiguration")
- public void setV1beta3PriorityLevelConfiguration(io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.PriorityLevelConfiguration v1beta3PriorityLevelConfiguration) {
- this.v1beta3PriorityLevelConfiguration = v1beta3PriorityLevelConfiguration;
- }
-
- @JsonProperty("V1beta3PriorityLevelConfigurationList")
- public io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.PriorityLevelConfigurationList getV1beta3PriorityLevelConfigurationList() {
- return v1beta3PriorityLevelConfigurationList;
- }
-
- @JsonProperty("V1beta3PriorityLevelConfigurationList")
- public void setV1beta3PriorityLevelConfigurationList(io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.PriorityLevelConfigurationList v1beta3PriorityLevelConfigurationList) {
- this.v1beta3PriorityLevelConfigurationList = v1beta3PriorityLevelConfigurationList;
- }
-
- @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-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1/FlowSchema.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1/FlowSchema.java
index e25d607edcf..a407cb0ba0b 100644
--- a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1/FlowSchema.java
+++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1/FlowSchema.java
@@ -17,6 +17,7 @@
import io.fabric8.kubernetes.api.model.IntOrString;
import io.fabric8.kubernetes.api.model.LabelSelector;
import io.fabric8.kubernetes.api.model.LocalObjectReference;
+import io.fabric8.kubernetes.api.model.ObjectMeta;
import io.fabric8.kubernetes.api.model.ObjectReference;
import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
import io.fabric8.kubernetes.api.model.PodTemplateSpec;
@@ -47,7 +48,7 @@
""
})
@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
- @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class),
+ @BuildableReference(ObjectMeta.class),
@BuildableReference(LabelSelector.class),
@BuildableReference(Container.class),
@BuildableReference(PodTemplateSpec.class),
@@ -81,7 +82,7 @@ public class FlowSchema implements Editable , HasMetadata
@JsonProperty("kind")
private String kind = "FlowSchema";
@JsonProperty("metadata")
- private io.fabric8.kubernetes.api.model.ObjectMeta metadata;
+ private ObjectMeta metadata;
@JsonProperty("spec")
private FlowSchemaSpec spec;
@JsonProperty("status")
@@ -96,7 +97,7 @@ public class FlowSchema implements Editable , HasMetadata
public FlowSchema() {
}
- public FlowSchema(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, FlowSchemaSpec spec, FlowSchemaStatus status) {
+ public FlowSchema(String apiVersion, String kind, ObjectMeta metadata, FlowSchemaSpec spec, FlowSchemaStatus status) {
super();
this.apiVersion = apiVersion;
this.kind = kind;
@@ -146,12 +147,12 @@ public void setKind(String kind) {
}
@JsonProperty("metadata")
- public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() {
+ public ObjectMeta getMetadata() {
return metadata;
}
@JsonProperty("metadata")
- public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) {
+ public void setMetadata(ObjectMeta metadata) {
this.metadata = metadata;
}
diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1/PriorityLevelConfiguration.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1/PriorityLevelConfiguration.java
index a7c7548ce4c..0e85305dac1 100644
--- a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1/PriorityLevelConfiguration.java
+++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1/PriorityLevelConfiguration.java
@@ -17,6 +17,7 @@
import io.fabric8.kubernetes.api.model.IntOrString;
import io.fabric8.kubernetes.api.model.LabelSelector;
import io.fabric8.kubernetes.api.model.LocalObjectReference;
+import io.fabric8.kubernetes.api.model.ObjectMeta;
import io.fabric8.kubernetes.api.model.ObjectReference;
import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
import io.fabric8.kubernetes.api.model.PodTemplateSpec;
@@ -47,7 +48,7 @@
""
})
@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
- @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class),
+ @BuildableReference(ObjectMeta.class),
@BuildableReference(LabelSelector.class),
@BuildableReference(Container.class),
@BuildableReference(PodTemplateSpec.class),
@@ -81,7 +82,7 @@ public class PriorityLevelConfiguration implements Editable , KubernetesResource
-{
-
- @JsonProperty("lendablePercent")
- private Integer lendablePercent;
- @JsonProperty("nominalConcurrencyShares")
- private Integer nominalConcurrencyShares;
- @JsonIgnore
- private Map additionalProperties = new LinkedHashMap();
-
- /**
- * No args constructor for use in serialization
- *
- */
- public ExemptPriorityLevelConfiguration() {
- }
-
- public ExemptPriorityLevelConfiguration(Integer lendablePercent, Integer nominalConcurrencyShares) {
- super();
- this.lendablePercent = lendablePercent;
- this.nominalConcurrencyShares = nominalConcurrencyShares;
- }
-
- @JsonProperty("lendablePercent")
- public Integer getLendablePercent() {
- return lendablePercent;
- }
-
- @JsonProperty("lendablePercent")
- public void setLendablePercent(Integer lendablePercent) {
- this.lendablePercent = lendablePercent;
- }
-
- @JsonProperty("nominalConcurrencyShares")
- public Integer getNominalConcurrencyShares() {
- return nominalConcurrencyShares;
- }
-
- @JsonProperty("nominalConcurrencyShares")
- public void setNominalConcurrencyShares(Integer nominalConcurrencyShares) {
- this.nominalConcurrencyShares = nominalConcurrencyShares;
- }
-
- @JsonIgnore
- public ExemptPriorityLevelConfigurationBuilder edit() {
- return new ExemptPriorityLevelConfigurationBuilder(this);
- }
-
- @JsonIgnore
- public ExemptPriorityLevelConfigurationBuilder toBuilder() {
- return edit();
- }
-
- @JsonAnyGetter
- public Map getAdditionalProperties() {
- return this.additionalProperties;
- }
-
- @JsonAnySetter
- public void setAdditionalProperty(String name, Object value) {
- this.additionalProperties.put(name, value);
- }
-
- public void setAdditionalProperties(Map additionalProperties) {
- this.additionalProperties = additionalProperties;
- }
-
-}
diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta1/FlowSchema.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta1/FlowSchema.java
index 1571ef6eea0..9b8a8e59fb9 100644
--- a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta1/FlowSchema.java
+++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta1/FlowSchema.java
@@ -17,6 +17,7 @@
import io.fabric8.kubernetes.api.model.IntOrString;
import io.fabric8.kubernetes.api.model.LabelSelector;
import io.fabric8.kubernetes.api.model.LocalObjectReference;
+import io.fabric8.kubernetes.api.model.ObjectMeta;
import io.fabric8.kubernetes.api.model.ObjectReference;
import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
import io.fabric8.kubernetes.api.model.PodTemplateSpec;
@@ -47,7 +48,7 @@
""
})
@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
- @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class),
+ @BuildableReference(ObjectMeta.class),
@BuildableReference(LabelSelector.class),
@BuildableReference(Container.class),
@BuildableReference(PodTemplateSpec.class),
@@ -81,7 +82,7 @@ public class FlowSchema implements Editable , HasMetadata
@JsonProperty("kind")
private String kind = "FlowSchema";
@JsonProperty("metadata")
- private io.fabric8.kubernetes.api.model.ObjectMeta metadata;
+ private ObjectMeta metadata;
@JsonProperty("spec")
private FlowSchemaSpec spec;
@JsonProperty("status")
@@ -96,7 +97,7 @@ public class FlowSchema implements Editable , HasMetadata
public FlowSchema() {
}
- public FlowSchema(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, FlowSchemaSpec spec, FlowSchemaStatus status) {
+ public FlowSchema(String apiVersion, String kind, ObjectMeta metadata, FlowSchemaSpec spec, FlowSchemaStatus status) {
super();
this.apiVersion = apiVersion;
this.kind = kind;
@@ -146,12 +147,12 @@ public void setKind(String kind) {
}
@JsonProperty("metadata")
- public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() {
+ public ObjectMeta getMetadata() {
return metadata;
}
@JsonProperty("metadata")
- public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) {
+ public void setMetadata(ObjectMeta metadata) {
this.metadata = metadata;
}
diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta1/LimitedPriorityLevelConfiguration.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta1/LimitedPriorityLevelConfiguration.java
index 23b61a27e0d..c77cb61ca66 100644
--- a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta1/LimitedPriorityLevelConfiguration.java
+++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta1/LimitedPriorityLevelConfiguration.java
@@ -32,8 +32,6 @@
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({
"assuredConcurrencyShares",
- "borrowingLimitPercent",
- "lendablePercent",
"limitResponse"
})
@ToString
@@ -59,10 +57,6 @@ public class LimitedPriorityLevelConfiguration implements Editable , KubernetesResource
{
- @JsonProperty("exempt")
- private ExemptPriorityLevelConfiguration exempt;
@JsonProperty("limited")
private LimitedPriorityLevelConfiguration limited;
@JsonProperty("type")
@@ -72,23 +69,12 @@ public class PriorityLevelConfigurationSpec implements Editable , KubernetesResource
-{
-
- @JsonProperty("lendablePercent")
- private Integer lendablePercent;
- @JsonProperty("nominalConcurrencyShares")
- private Integer nominalConcurrencyShares;
- @JsonIgnore
- private Map additionalProperties = new LinkedHashMap();
-
- /**
- * No args constructor for use in serialization
- *
- */
- public ExemptPriorityLevelConfiguration() {
- }
-
- public ExemptPriorityLevelConfiguration(Integer lendablePercent, Integer nominalConcurrencyShares) {
- super();
- this.lendablePercent = lendablePercent;
- this.nominalConcurrencyShares = nominalConcurrencyShares;
- }
-
- @JsonProperty("lendablePercent")
- public Integer getLendablePercent() {
- return lendablePercent;
- }
-
- @JsonProperty("lendablePercent")
- public void setLendablePercent(Integer lendablePercent) {
- this.lendablePercent = lendablePercent;
- }
-
- @JsonProperty("nominalConcurrencyShares")
- public Integer getNominalConcurrencyShares() {
- return nominalConcurrencyShares;
- }
-
- @JsonProperty("nominalConcurrencyShares")
- public void setNominalConcurrencyShares(Integer nominalConcurrencyShares) {
- this.nominalConcurrencyShares = nominalConcurrencyShares;
- }
-
- @JsonIgnore
- public ExemptPriorityLevelConfigurationBuilder edit() {
- return new ExemptPriorityLevelConfigurationBuilder(this);
- }
-
- @JsonIgnore
- public ExemptPriorityLevelConfigurationBuilder toBuilder() {
- return edit();
- }
-
- @JsonAnyGetter
- public Map getAdditionalProperties() {
- return this.additionalProperties;
- }
-
- @JsonAnySetter
- public void setAdditionalProperty(String name, Object value) {
- this.additionalProperties.put(name, value);
- }
-
- public void setAdditionalProperties(Map additionalProperties) {
- this.additionalProperties = additionalProperties;
- }
-
-}
diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/FlowSchema.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/FlowSchema.java
index 4da9a25df69..7bd6c3e7866 100644
--- a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/FlowSchema.java
+++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/FlowSchema.java
@@ -17,6 +17,7 @@
import io.fabric8.kubernetes.api.model.IntOrString;
import io.fabric8.kubernetes.api.model.LabelSelector;
import io.fabric8.kubernetes.api.model.LocalObjectReference;
+import io.fabric8.kubernetes.api.model.ObjectMeta;
import io.fabric8.kubernetes.api.model.ObjectReference;
import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
import io.fabric8.kubernetes.api.model.PodTemplateSpec;
@@ -47,7 +48,7 @@
""
})
@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
- @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class),
+ @BuildableReference(ObjectMeta.class),
@BuildableReference(LabelSelector.class),
@BuildableReference(Container.class),
@BuildableReference(PodTemplateSpec.class),
@@ -81,7 +82,7 @@ public class FlowSchema implements Editable , HasMetadata
@JsonProperty("kind")
private String kind = "FlowSchema";
@JsonProperty("metadata")
- private io.fabric8.kubernetes.api.model.ObjectMeta metadata;
+ private ObjectMeta metadata;
@JsonProperty("spec")
private FlowSchemaSpec spec;
@JsonProperty("status")
@@ -96,7 +97,7 @@ public class FlowSchema implements Editable , HasMetadata
public FlowSchema() {
}
- public FlowSchema(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, FlowSchemaSpec spec, FlowSchemaStatus status) {
+ public FlowSchema(String apiVersion, String kind, ObjectMeta metadata, FlowSchemaSpec spec, FlowSchemaStatus status) {
super();
this.apiVersion = apiVersion;
this.kind = kind;
@@ -146,12 +147,12 @@ public void setKind(String kind) {
}
@JsonProperty("metadata")
- public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() {
+ public ObjectMeta getMetadata() {
return metadata;
}
@JsonProperty("metadata")
- public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) {
+ public void setMetadata(ObjectMeta metadata) {
this.metadata = metadata;
}
diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/PriorityLevelConfiguration.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/PriorityLevelConfiguration.java
index c9d3333a882..2e7a73ee898 100644
--- a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/PriorityLevelConfiguration.java
+++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/PriorityLevelConfiguration.java
@@ -17,6 +17,7 @@
import io.fabric8.kubernetes.api.model.IntOrString;
import io.fabric8.kubernetes.api.model.LabelSelector;
import io.fabric8.kubernetes.api.model.LocalObjectReference;
+import io.fabric8.kubernetes.api.model.ObjectMeta;
import io.fabric8.kubernetes.api.model.ObjectReference;
import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
import io.fabric8.kubernetes.api.model.PodTemplateSpec;
@@ -47,7 +48,7 @@
""
})
@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
- @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class),
+ @BuildableReference(ObjectMeta.class),
@BuildableReference(LabelSelector.class),
@BuildableReference(Container.class),
@BuildableReference(PodTemplateSpec.class),
@@ -81,7 +82,7 @@ public class PriorityLevelConfiguration implements Editable , KubernetesResource
{
- @JsonProperty("exempt")
- private ExemptPriorityLevelConfiguration exempt;
@JsonProperty("limited")
private LimitedPriorityLevelConfiguration limited;
@JsonProperty("type")
@@ -72,23 +69,12 @@ public class PriorityLevelConfigurationSpec implements Editable , HasMetadata
@JsonProperty("kind")
private String kind = "FlowSchema";
@JsonProperty("metadata")
- private io.fabric8.kubernetes.api.model.ObjectMeta metadata;
+ private ObjectMeta metadata;
@JsonProperty("spec")
private FlowSchemaSpec spec;
@JsonProperty("status")
@@ -96,7 +97,7 @@ public class FlowSchema implements Editable , HasMetadata
public FlowSchema() {
}
- public FlowSchema(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, FlowSchemaSpec spec, FlowSchemaStatus status) {
+ public FlowSchema(String apiVersion, String kind, ObjectMeta metadata, FlowSchemaSpec spec, FlowSchemaStatus status) {
super();
this.apiVersion = apiVersion;
this.kind = kind;
@@ -146,12 +147,12 @@ public void setKind(String kind) {
}
@JsonProperty("metadata")
- public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() {
+ public ObjectMeta getMetadata() {
return metadata;
}
@JsonProperty("metadata")
- public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) {
+ public void setMetadata(ObjectMeta metadata) {
this.metadata = metadata;
}
diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta3/PriorityLevelConfiguration.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta3/PriorityLevelConfiguration.java
index 94377851d92..6b0ef6d8943 100644
--- a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta3/PriorityLevelConfiguration.java
+++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta3/PriorityLevelConfiguration.java
@@ -17,6 +17,7 @@
import io.fabric8.kubernetes.api.model.IntOrString;
import io.fabric8.kubernetes.api.model.LabelSelector;
import io.fabric8.kubernetes.api.model.LocalObjectReference;
+import io.fabric8.kubernetes.api.model.ObjectMeta;
import io.fabric8.kubernetes.api.model.ObjectReference;
import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
import io.fabric8.kubernetes.api.model.PodTemplateSpec;
@@ -47,7 +48,7 @@
""
})
@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
- @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class),
+ @BuildableReference(ObjectMeta.class),
@BuildableReference(LabelSelector.class),
@BuildableReference(Container.class),
@BuildableReference(PodTemplateSpec.class),
@@ -81,7 +82,7 @@ public class PriorityLevelConfiguration implements Editable , KubernetesResource
-{
-
- @JsonProperty("apiServerID")
- private String apiServerID;
- @JsonProperty("decodableVersions")
- @JsonInclude(JsonInclude.Include.NON_EMPTY)
- private List decodableVersions = new ArrayList<>();
- @JsonProperty("encodingVersion")
- private String encodingVersion;
- @JsonProperty("servedVersions")
- @JsonInclude(JsonInclude.Include.NON_EMPTY)
- private List servedVersions = new ArrayList<>();
- @JsonIgnore
- private Map additionalProperties = new LinkedHashMap();
-
- /**
- * No args constructor for use in serialization
- *
- */
- public ServerStorageVersion() {
- }
-
- public ServerStorageVersion(String apiServerID, List decodableVersions, String encodingVersion, List servedVersions) {
- super();
- this.apiServerID = apiServerID;
- this.decodableVersions = decodableVersions;
- this.encodingVersion = encodingVersion;
- this.servedVersions = servedVersions;
- }
-
- @JsonProperty("apiServerID")
- public String getApiServerID() {
- return apiServerID;
- }
-
- @JsonProperty("apiServerID")
- public void setApiServerID(String apiServerID) {
- this.apiServerID = apiServerID;
- }
-
- @JsonProperty("decodableVersions")
- @JsonInclude(JsonInclude.Include.NON_EMPTY)
- public List getDecodableVersions() {
- return decodableVersions;
- }
-
- @JsonProperty("decodableVersions")
- public void setDecodableVersions(List decodableVersions) {
- this.decodableVersions = decodableVersions;
- }
-
- @JsonProperty("encodingVersion")
- public String getEncodingVersion() {
- return encodingVersion;
- }
-
- @JsonProperty("encodingVersion")
- public void setEncodingVersion(String encodingVersion) {
- this.encodingVersion = encodingVersion;
- }
-
- @JsonProperty("servedVersions")
- @JsonInclude(JsonInclude.Include.NON_EMPTY)
- public List getServedVersions() {
- return servedVersions;
- }
-
- @JsonProperty("servedVersions")
- public void setServedVersions(List servedVersions) {
- this.servedVersions = servedVersions;
- }
-
- @JsonIgnore
- public ServerStorageVersionBuilder edit() {
- return new ServerStorageVersionBuilder(this);
- }
-
- @JsonIgnore
- public ServerStorageVersionBuilder toBuilder() {
- return edit();
- }
-
- @JsonAnyGetter
- public Map getAdditionalProperties() {
- return this.additionalProperties;
- }
-
- @JsonAnySetter
- public void setAdditionalProperty(String name, Object value) {
- this.additionalProperties.put(name, value);
- }
-
- public void setAdditionalProperties(Map additionalProperties) {
- this.additionalProperties = additionalProperties;
- }
-
-}
diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/internal/apiserver/v1alpha1/StorageVersion.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/internal/apiserver/v1alpha1/StorageVersion.java
deleted file mode 100644
index 56e3600e4dc..00000000000
--- a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/internal/apiserver/v1alpha1/StorageVersion.java
+++ /dev/null
@@ -1,202 +0,0 @@
-
-package io.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.HasMetadata;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.fabric8.kubernetes.model.annotation.Group;
-import io.fabric8.kubernetes.model.annotation.Version;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import io.sundr.transform.annotations.TemplateTransformation;
-import io.sundr.transform.annotations.TemplateTransformations;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
- "apiVersion",
- "kind",
- "metadata",
- "spec",
- "status"
-})
-@ToString
-@EqualsAndHashCode
-@Accessors(prefix = {
- "_",
- ""
-})
-@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(LabelSelector.class),
- @BuildableReference(Container.class),
- @BuildableReference(PodTemplateSpec.class),
- @BuildableReference(ResourceRequirements.class),
- @BuildableReference(IntOrString.class),
- @BuildableReference(ObjectReference.class),
- @BuildableReference(LocalObjectReference.class),
- @BuildableReference(PersistentVolumeClaim.class)
-})
-@TemplateTransformations({
- @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true)
-})
-@Version("v1alpha1")
-@Group("internal.apiserver.k8s.io")
-@Generated("jsonschema2pojo")
-public class StorageVersion implements Editable , HasMetadata
-{
-
- /**
- *
- * (Required)
- *
- */
- @JsonProperty("apiVersion")
- private String apiVersion = "internal.apiserver.k8s.io/v1alpha1";
- /**
- *
- * (Required)
- *
- */
- @JsonProperty("kind")
- private String kind = "StorageVersion";
- @JsonProperty("metadata")
- private io.fabric8.kubernetes.api.model.ObjectMeta metadata;
- @JsonProperty("spec")
- private StorageVersionSpec spec;
- @JsonProperty("status")
- private StorageVersionStatus status;
- @JsonIgnore
- private Map additionalProperties = new LinkedHashMap();
-
- /**
- * No args constructor for use in serialization
- *
- */
- public StorageVersion() {
- }
-
- public StorageVersion(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, StorageVersionSpec spec, StorageVersionStatus status) {
- super();
- this.apiVersion = apiVersion;
- this.kind = kind;
- this.metadata = metadata;
- this.spec = spec;
- this.status = status;
- }
-
- /**
- *
- * (Required)
- *
- */
- @JsonProperty("apiVersion")
- public String getApiVersion() {
- return apiVersion;
- }
-
- /**
- *
- * (Required)
- *
- */
- @JsonProperty("apiVersion")
- public void setApiVersion(String apiVersion) {
- this.apiVersion = apiVersion;
- }
-
- /**
- *
- * (Required)
- *
- */
- @JsonProperty("kind")
- public String getKind() {
- return kind;
- }
-
- /**
- *
- * (Required)
- *
- */
- @JsonProperty("kind")
- public void setKind(String kind) {
- this.kind = kind;
- }
-
- @JsonProperty("metadata")
- public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() {
- return metadata;
- }
-
- @JsonProperty("metadata")
- public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) {
- this.metadata = metadata;
- }
-
- @JsonProperty("spec")
- public StorageVersionSpec getSpec() {
- return spec;
- }
-
- @JsonProperty("spec")
- public void setSpec(StorageVersionSpec spec) {
- this.spec = spec;
- }
-
- @JsonProperty("status")
- public StorageVersionStatus getStatus() {
- return status;
- }
-
- @JsonProperty("status")
- public void setStatus(StorageVersionStatus status) {
- this.status = status;
- }
-
- @JsonIgnore
- public StorageVersionBuilder edit() {
- return new StorageVersionBuilder(this);
- }
-
- @JsonIgnore
- public StorageVersionBuilder toBuilder() {
- return edit();
- }
-
- @JsonAnyGetter
- public Map getAdditionalProperties() {
- return this.additionalProperties;
- }
-
- @JsonAnySetter
- public void setAdditionalProperty(String name, Object value) {
- this.additionalProperties.put(name, value);
- }
-
- public void setAdditionalProperties(Map additionalProperties) {
- this.additionalProperties = additionalProperties;
- }
-
-}
diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/internal/apiserver/v1alpha1/StorageVersionCondition.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/internal/apiserver/v1alpha1/StorageVersionCondition.java
deleted file mode 100644
index 63533673a82..00000000000
--- a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/internal/apiserver/v1alpha1/StorageVersionCondition.java
+++ /dev/null
@@ -1,178 +0,0 @@
-
-package io.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
- "lastTransitionTime",
- "message",
- "observedGeneration",
- "reason",
- "status",
- "type"
-})
-@ToString
-@EqualsAndHashCode
-@Accessors(prefix = {
- "_",
- ""
-})
-@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
- @BuildableReference(ObjectMeta.class),
- @BuildableReference(LabelSelector.class),
- @BuildableReference(Container.class),
- @BuildableReference(PodTemplateSpec.class),
- @BuildableReference(ResourceRequirements.class),
- @BuildableReference(IntOrString.class),
- @BuildableReference(ObjectReference.class),
- @BuildableReference(LocalObjectReference.class),
- @BuildableReference(PersistentVolumeClaim.class)
-})
-@Generated("jsonschema2pojo")
-public class StorageVersionCondition implements Editable , KubernetesResource
-{
-
- @JsonProperty("lastTransitionTime")
- private String lastTransitionTime;
- @JsonProperty("message")
- private String message;
- @JsonProperty("observedGeneration")
- private Long observedGeneration;
- @JsonProperty("reason")
- private String reason;
- @JsonProperty("status")
- private String status;
- @JsonProperty("type")
- private String type;
- @JsonIgnore
- private Map additionalProperties = new LinkedHashMap();
-
- /**
- * No args constructor for use in serialization
- *
- */
- public StorageVersionCondition() {
- }
-
- public StorageVersionCondition(String lastTransitionTime, String message, Long observedGeneration, String reason, String status, String type) {
- super();
- this.lastTransitionTime = lastTransitionTime;
- this.message = message;
- this.observedGeneration = observedGeneration;
- this.reason = reason;
- this.status = status;
- this.type = type;
- }
-
- @JsonProperty("lastTransitionTime")
- public String getLastTransitionTime() {
- return lastTransitionTime;
- }
-
- @JsonProperty("lastTransitionTime")
- public void setLastTransitionTime(String lastTransitionTime) {
- this.lastTransitionTime = lastTransitionTime;
- }
-
- @JsonProperty("message")
- public String getMessage() {
- return message;
- }
-
- @JsonProperty("message")
- public void setMessage(String message) {
- this.message = message;
- }
-
- @JsonProperty("observedGeneration")
- public Long getObservedGeneration() {
- return observedGeneration;
- }
-
- @JsonProperty("observedGeneration")
- public void setObservedGeneration(Long observedGeneration) {
- this.observedGeneration = observedGeneration;
- }
-
- @JsonProperty("reason")
- public String getReason() {
- return reason;
- }
-
- @JsonProperty("reason")
- public void setReason(String reason) {
- this.reason = reason;
- }
-
- @JsonProperty("status")
- public String getStatus() {
- return status;
- }
-
- @JsonProperty("status")
- public void setStatus(String status) {
- this.status = status;
- }
-
- @JsonProperty("type")
- public String getType() {
- return type;
- }
-
- @JsonProperty("type")
- public void setType(String type) {
- this.type = type;
- }
-
- @JsonIgnore
- public StorageVersionConditionBuilder edit() {
- return new StorageVersionConditionBuilder(this);
- }
-
- @JsonIgnore
- public StorageVersionConditionBuilder toBuilder() {
- return edit();
- }
-
- @JsonAnyGetter
- public Map getAdditionalProperties() {
- return this.additionalProperties;
- }
-
- @JsonAnySetter
- public void setAdditionalProperty(String name, Object value) {
- this.additionalProperties.put(name, value);
- }
-
- public void setAdditionalProperties(Map additionalProperties) {
- this.additionalProperties = additionalProperties;
- }
-
-}
diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/internal/apiserver/v1alpha1/StorageVersionList.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/internal/apiserver/v1alpha1/StorageVersionList.java
deleted file mode 100644
index 3904384ff19..00000000000
--- a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/internal/apiserver/v1alpha1/StorageVersionList.java
+++ /dev/null
@@ -1,195 +0,0 @@
-
-package io.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.KubernetesResourceList;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.ListMeta;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.fabric8.kubernetes.model.annotation.Group;
-import io.fabric8.kubernetes.model.annotation.Version;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import io.sundr.transform.annotations.TemplateTransformation;
-import io.sundr.transform.annotations.TemplateTransformations;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
- "apiVersion",
- "kind",
- "metadata",
- "items"
-})
-@ToString
-@EqualsAndHashCode
-@Accessors(prefix = {
- "_",
- ""
-})
-@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
- @BuildableReference(ObjectMeta.class),
- @BuildableReference(LabelSelector.class),
- @BuildableReference(Container.class),
- @BuildableReference(PodTemplateSpec.class),
- @BuildableReference(ResourceRequirements.class),
- @BuildableReference(IntOrString.class),
- @BuildableReference(ObjectReference.class),
- @BuildableReference(LocalObjectReference.class),
- @BuildableReference(PersistentVolumeClaim.class)
-})
-@TemplateTransformations({
- @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true)
-})
-@Version("v1alpha1")
-@Group("internal.apiserver.k8s.io")
-@Generated("jsonschema2pojo")
-public class StorageVersionList implements Editable , KubernetesResource, KubernetesResourceList
-{
-
- /**
- *
- * (Required)
- *
- */
- @JsonProperty("apiVersion")
- private String apiVersion = "internal.apiserver.k8s.io/v1alpha1";
- @JsonProperty("items")
- @JsonInclude(JsonInclude.Include.NON_EMPTY)
- private List items = new ArrayList<>();
- /**
- *
- * (Required)
- *
- */
- @JsonProperty("kind")
- private String kind = "StorageVersionList";
- @JsonProperty("metadata")
- private ListMeta metadata;
- @JsonIgnore
- private Map additionalProperties = new LinkedHashMap();
-
- /**
- * No args constructor for use in serialization
- *
- */
- public StorageVersionList() {
- }
-
- public StorageVersionList(String apiVersion, List items, String kind, ListMeta metadata) {
- super();
- this.apiVersion = apiVersion;
- this.items = items;
- this.kind = kind;
- this.metadata = metadata;
- }
-
- /**
- *
- * (Required)
- *
- */
- @JsonProperty("apiVersion")
- public String getApiVersion() {
- return apiVersion;
- }
-
- /**
- *
- * (Required)
- *
- */
- @JsonProperty("apiVersion")
- public void setApiVersion(String apiVersion) {
- this.apiVersion = apiVersion;
- }
-
- @JsonProperty("items")
- @JsonInclude(JsonInclude.Include.NON_EMPTY)
- public List getItems() {
- return items;
- }
-
- @JsonProperty("items")
- public void setItems(List items) {
- this.items = items;
- }
-
- /**
- *
- * (Required)
- *
- */
- @JsonProperty("kind")
- public String getKind() {
- return kind;
- }
-
- /**
- *
- * (Required)
- *
- */
- @JsonProperty("kind")
- public void setKind(String kind) {
- this.kind = kind;
- }
-
- @JsonProperty("metadata")
- public ListMeta getMetadata() {
- return metadata;
- }
-
- @JsonProperty("metadata")
- public void setMetadata(ListMeta metadata) {
- this.metadata = metadata;
- }
-
- @JsonIgnore
- public StorageVersionListBuilder edit() {
- return new StorageVersionListBuilder(this);
- }
-
- @JsonIgnore
- public StorageVersionListBuilder toBuilder() {
- return edit();
- }
-
- @JsonAnyGetter
- public Map getAdditionalProperties() {
- return this.additionalProperties;
- }
-
- @JsonAnySetter
- public void setAdditionalProperty(String name, Object value) {
- this.additionalProperties.put(name, value);
- }
-
- public void setAdditionalProperties(Map additionalProperties) {
- this.additionalProperties = additionalProperties;
- }
-
-}
diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/internal/apiserver/v1alpha1/StorageVersionSpec.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/internal/apiserver/v1alpha1/StorageVersionSpec.java
deleted file mode 100644
index c235c0b4976..00000000000
--- a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/internal/apiserver/v1alpha1/StorageVersionSpec.java
+++ /dev/null
@@ -1,83 +0,0 @@
-
-package io.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-
-})
-@ToString
-@EqualsAndHashCode
-@Accessors(prefix = {
- "_",
- ""
-})
-@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
- @BuildableReference(ObjectMeta.class),
- @BuildableReference(LabelSelector.class),
- @BuildableReference(Container.class),
- @BuildableReference(PodTemplateSpec.class),
- @BuildableReference(ResourceRequirements.class),
- @BuildableReference(IntOrString.class),
- @BuildableReference(ObjectReference.class),
- @BuildableReference(LocalObjectReference.class),
- @BuildableReference(PersistentVolumeClaim.class)
-})
-@Generated("jsonschema2pojo")
-public class StorageVersionSpec implements Editable , KubernetesResource
-{
-
- @JsonIgnore
- private Map additionalProperties = new LinkedHashMap();
-
- @JsonIgnore
- public StorageVersionSpecBuilder edit() {
- return new StorageVersionSpecBuilder(this);
- }
-
- @JsonIgnore
- public StorageVersionSpecBuilder toBuilder() {
- return edit();
- }
-
- @JsonAnyGetter
- public Map getAdditionalProperties() {
- return this.additionalProperties;
- }
-
- @JsonAnySetter
- public void setAdditionalProperty(String name, Object value) {
- this.additionalProperties.put(name, value);
- }
-
- public void setAdditionalProperties(Map additionalProperties) {
- this.additionalProperties = additionalProperties;
- }
-
-}
diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/internal/apiserver/v1alpha1/StorageVersionStatus.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/internal/apiserver/v1alpha1/StorageVersionStatus.java
deleted file mode 100644
index 13059a8fa66..00000000000
--- a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/internal/apiserver/v1alpha1/StorageVersionStatus.java
+++ /dev/null
@@ -1,142 +0,0 @@
-
-package io.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
- "commonEncodingVersion",
- "conditions",
- "storageVersions"
-})
-@ToString
-@EqualsAndHashCode
-@Accessors(prefix = {
- "_",
- ""
-})
-@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
- @BuildableReference(ObjectMeta.class),
- @BuildableReference(LabelSelector.class),
- @BuildableReference(Container.class),
- @BuildableReference(PodTemplateSpec.class),
- @BuildableReference(ResourceRequirements.class),
- @BuildableReference(IntOrString.class),
- @BuildableReference(ObjectReference.class),
- @BuildableReference(LocalObjectReference.class),
- @BuildableReference(PersistentVolumeClaim.class)
-})
-@Generated("jsonschema2pojo")
-public class StorageVersionStatus implements Editable , KubernetesResource
-{
-
- @JsonProperty("commonEncodingVersion")
- private String commonEncodingVersion;
- @JsonProperty("conditions")
- @JsonInclude(JsonInclude.Include.NON_EMPTY)
- private List conditions = new ArrayList<>();
- @JsonProperty("storageVersions")
- @JsonInclude(JsonInclude.Include.NON_EMPTY)
- private List storageVersions = new ArrayList<>();
- @JsonIgnore
- private Map additionalProperties = new LinkedHashMap();
-
- /**
- * No args constructor for use in serialization
- *
- */
- public StorageVersionStatus() {
- }
-
- public StorageVersionStatus(String commonEncodingVersion, List conditions, List storageVersions) {
- super();
- this.commonEncodingVersion = commonEncodingVersion;
- this.conditions = conditions;
- this.storageVersions = storageVersions;
- }
-
- @JsonProperty("commonEncodingVersion")
- public String getCommonEncodingVersion() {
- return commonEncodingVersion;
- }
-
- @JsonProperty("commonEncodingVersion")
- public void setCommonEncodingVersion(String commonEncodingVersion) {
- this.commonEncodingVersion = commonEncodingVersion;
- }
-
- @JsonProperty("conditions")
- @JsonInclude(JsonInclude.Include.NON_EMPTY)
- public List getConditions() {
- return conditions;
- }
-
- @JsonProperty("conditions")
- public void setConditions(List conditions) {
- this.conditions = conditions;
- }
-
- @JsonProperty("storageVersions")
- @JsonInclude(JsonInclude.Include.NON_EMPTY)
- public List getStorageVersions() {
- return storageVersions;
- }
-
- @JsonProperty("storageVersions")
- public void setStorageVersions(List storageVersions) {
- this.storageVersions = storageVersions;
- }
-
- @JsonIgnore
- public StorageVersionStatusBuilder edit() {
- return new StorageVersionStatusBuilder(this);
- }
-
- @JsonIgnore
- public StorageVersionStatusBuilder toBuilder() {
- return edit();
- }
-
- @JsonAnyGetter
- public Map getAdditionalProperties() {
- return this.additionalProperties;
- }
-
- @JsonAnySetter
- public void setAdditionalProperty(String name, Object value) {
- this.additionalProperties.put(name, value);
- }
-
- public void setAdditionalProperties(Map additionalProperties) {
- this.additionalProperties = additionalProperties;
- }
-
-}
diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/test/java/io/fabric8/kubernetes/api/model/internal/apiserver/v1alpha1/StorageVersionTest.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/test/java/io/fabric8/kubernetes/api/model/internal/apiserver/v1alpha1/StorageVersionTest.java
deleted file mode 100644
index ccc17b3e34d..00000000000
--- a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/test/java/io/fabric8/kubernetes/api/model/internal/apiserver/v1alpha1/StorageVersionTest.java
+++ /dev/null
@@ -1,113 +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 io.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import io.fabric8.kubernetes.api.model.Namespaced;
-import org.assertj.core.api.InstanceOfAssertFactories;
-import org.junit.jupiter.api.Test;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Scanner;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-class StorageVersionTest {
- private final ObjectMapper mapper = new ObjectMapper();
-
- @Test
- void isClusterScoped() {
- assertThat(StorageVersion.class).isNotInstanceOf(Namespaced.class);
- }
-
- @Test
- void deserializationAndSerializationShouldWorkAsExpected() throws IOException {
- // Given
- String originalJson = new Scanner(getClass().getResourceAsStream("/valid-internal-apiserver-storageversion.json"))
- .useDelimiter("\\A")
- .next();
-
- // When
- final StorageVersion storageVersion = mapper.readValue(originalJson, StorageVersion.class);
- final String serializedJson = mapper.writeValueAsString(storageVersion);
-
- // Then
- assertThat(serializedJson).isNotNull();
- assertThat(storageVersion)
- .isNotNull()
- .hasFieldOrPropertyWithValue("metadata.name", "apps.deployments")
- .hasFieldOrPropertyWithValue("status.commonEncodingVersion", "apps/v1")
- .satisfies(s -> assertThat(s.getStatus().getConditions())
- .singleElement(InstanceOfAssertFactories.type(StorageVersionCondition.class))
- .hasFieldOrPropertyWithValue("lastTransitionTime", "2023-06-04T17:16:57Z")
- .hasFieldOrPropertyWithValue("message", "Common encoding version set")
- .hasFieldOrPropertyWithValue("reason", "CommonEncodingVersionSet")
- .hasFieldOrPropertyWithValue("status", "True")
- .hasFieldOrPropertyWithValue("type", "AllEncodingVersionsEqual"))
- .satisfies(s -> assertThat(s.getStatus().getStorageVersions())
- .singleElement(InstanceOfAssertFactories.type(ServerStorageVersion.class))
- .hasFieldOrPropertyWithValue("apiServerID", "kube-apiserver-803c62b1-340f-4055-93ca-44aba8a35574")
- .hasFieldOrPropertyWithValue("decodableVersions", Arrays.asList("apps/v1", "apps/v1beta2", "apps/v1beta1"))
- .hasFieldOrPropertyWithValue("encodingVersion", "apps/v1"));
- }
-
- @Test
- void builderShouldCreateObject() {
- // Given
- StorageVersionBuilder storageVersionBuilder = new StorageVersionBuilder()
- .withNewMetadata()
- .withName("apps.deployments")
- .endMetadata()
- .withNewSpec()
- .endSpec()
- .withNewStatus()
- .withCommonEncodingVersion("apps/v1")
- .addNewCondition()
- .withLastTransitionTime("2023-06-04T17:16:57Z")
- .withMessage("Common encoding version set")
- .withReason("CommonEncodingVersionSet")
- .withStatus("True")
- .withType("AllEncodingVersionsEqual")
- .endCondition()
- .addNewStorageVersion()
- .withApiServerID("kube-apiserver-803c62b1-340f-4055-93ca-44aba8a35574")
- .addToDecodableVersions("apps/v1", "apps/v1beta2", "apps/v1beta1")
- .withEncodingVersion("apps/v1")
- .endStorageVersion()
- .endStatus();
- // When
- StorageVersion storageVersion = storageVersionBuilder.build();
-
- // Then
- assertThat(storageVersion)
- .isNotNull()
- .hasFieldOrPropertyWithValue("metadata.name", "apps.deployments")
- .hasFieldOrPropertyWithValue("status.commonEncodingVersion", "apps/v1")
- .satisfies(s -> assertThat(s.getStatus().getConditions())
- .singleElement(InstanceOfAssertFactories.type(StorageVersionCondition.class))
- .hasFieldOrPropertyWithValue("lastTransitionTime", "2023-06-04T17:16:57Z")
- .hasFieldOrPropertyWithValue("message", "Common encoding version set")
- .hasFieldOrPropertyWithValue("reason", "CommonEncodingVersionSet")
- .hasFieldOrPropertyWithValue("status", "True")
- .hasFieldOrPropertyWithValue("type", "AllEncodingVersionsEqual"))
- .satisfies(s -> assertThat(s.getStatus().getStorageVersions())
- .singleElement(InstanceOfAssertFactories.type(ServerStorageVersion.class))
- .hasFieldOrPropertyWithValue("apiServerID", "kube-apiserver-803c62b1-340f-4055-93ca-44aba8a35574")
- .hasFieldOrPropertyWithValue("decodableVersions", Arrays.asList("apps/v1", "apps/v1beta2", "apps/v1beta1"))
- .hasFieldOrPropertyWithValue("encodingVersion", "apps/v1"));
- }
-}
diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/test/resources/valid-internal-apiserver-storageversion.json b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/test/resources/valid-internal-apiserver-storageversion.json
deleted file mode 100644
index f7007a5c64b..00000000000
--- a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/test/resources/valid-internal-apiserver-storageversion.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "apiVersion": "internal.apiserver.k8s.io/v1alpha1",
- "kind": "StorageVersion",
- "metadata": {
- "name": "apps.deployments"
- },
- "spec": {},
- "status": {
- "commonEncodingVersion": "apps/v1",
- "conditions": [
- {
- "lastTransitionTime": "2023-06-04T17:16:57Z",
- "message": "Common encoding version set",
- "reason": "CommonEncodingVersionSet",
- "status": "True",
- "type": "AllEncodingVersionsEqual"
- }
- ],
- "storageVersions": [
- {
- "apiServerID": "kube-apiserver-803c62b1-340f-4055-93ca-44aba8a35574",
- "decodableVersions": [
- "apps/v1",
- "apps/v1beta2",
- "apps/v1beta1"
- ],
- "encodingVersion": "apps/v1"
- }
- ]
- }
-}
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 b64c684b9f5..19ffb18a096 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,19 +45,6 @@ void setUp() {
.generateJavadoc(false);
}
- @Test
- void flowControl() {
- new ModelGenerator(baseSettings
- .clearSchemas()
- .schema(new File("../schemas/kubernetes-1.21.14.json"))
- .schema(new File("../schemas/kubernetes-1.26.15.json"))
- .schema(new File("../schemas/kubernetes-1.30.0.json"))
- .includeGenerationRegex("^io\\.k8s\\.api\\.flowcontrol\\..*$")
- .packageMapping("io.k8s.api.flowcontrol", "io.fabric8.kubernetes.api.model.flowcontrol")
- .build())
- .generate();
- }
-
@Test
void gatewayApi() {
new ModelGenerator(baseSettings
diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/StorageVersionTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/StorageVersionTest.java
deleted file mode 100644
index 7271f99b863..00000000000
--- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/StorageVersionTest.java
+++ /dev/null
@@ -1,111 +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 io.fabric8.kubernetes.client.mock;
-
-import io.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1.StorageVersion;
-import io.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1.StorageVersionBuilder;
-import io.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1.StorageVersionList;
-import io.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1.StorageVersionListBuilder;
-import io.fabric8.kubernetes.client.KubernetesClient;
-import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
-import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
-import org.junit.jupiter.api.Test;
-
-import java.net.HttpURLConnection;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-@EnableKubernetesMockClient
-class StorageVersionTest {
- KubernetesMockServer server;
- KubernetesClient client;
-
- @Test
- void get() {
- // Given
- server.expect().get().withPath("/apis/internal.apiserver.k8s.io/v1alpha1/storageversions/apps.deployments")
- .andReturn(HttpURLConnection.HTTP_OK, createNewStorageVersion())
- .once();
-
- // When
- StorageVersion storageVersion = client.resources(StorageVersion.class, StorageVersionList.class)
- .withName("apps.deployments").get();
-
- // Then
- assertThat(storageVersion)
- .isNotNull()
- .hasFieldOrPropertyWithValue("metadata.name", "apps.deployments");
- }
-
- @Test
- void list() {
- // Given
- server.expect().get().withPath("/apis/internal.apiserver.k8s.io/v1alpha1/storageversions")
- .andReturn(HttpURLConnection.HTTP_OK, new StorageVersionListBuilder()
- .addToItems(createNewStorageVersion())
- .build())
- .once();
-
- // When
- StorageVersionList storageVersionList = client.resources(StorageVersion.class, StorageVersionList.class).list();
-
- // Then
- assertThat(storageVersionList).isNotNull();
- assertThat(storageVersionList.getItems()).hasSize(1);
- assertThat(storageVersionList.getItems().get(0))
- .hasFieldOrPropertyWithValue("metadata.name", "apps.deployments");
- }
-
- @Test
- void delete() {
- // Given
- server.expect().delete().withPath("/apis/internal.apiserver.k8s.io/v1alpha1/storageversions/apps.deployments")
- .andReturn(HttpURLConnection.HTTP_OK, createNewStorageVersion())
- .once();
-
- // When
- boolean isDeleted = client.resources(StorageVersion.class, StorageVersionList.class).withName("apps.deployments").delete()
- .size() == 1;
-
- // Then
- assertThat(isDeleted).isTrue();
- }
-
- private StorageVersion createNewStorageVersion() {
- return new StorageVersionBuilder()
- .withNewMetadata()
- .withName("apps.deployments")
- .endMetadata()
- .withNewSpec()
- .endSpec()
- .withNewStatus()
- .withCommonEncodingVersion("apps/v1")
- .addNewCondition()
- .withLastTransitionTime("2023-06-04T17:16:57Z")
- .withMessage("Common encoding version set")
- .withReason("CommonEncodingVersionSet")
- .withStatus("True")
- .withType("AllEncodingVersionsEqual")
- .endCondition()
- .addNewStorageVersion()
- .withApiServerID("kube-apiserver-803c62b1-340f-4055-93ca-44aba8a35574")
- .addToDecodableVersions("apps/v1", "apps/v1beta2", "apps/v1beta1")
- .withEncodingVersion("apps/v1")
- .endStorageVersion()
- .endStatus()
- .build();
- }
-}