diff --git a/Makefile b/Makefile index f33edbfc481..b56cdd85a6a 100644 --- a/Makefile +++ b/Makefile @@ -64,6 +64,7 @@ generate-openapi-classes: cd kubernetes-model-generator/openshift-model-console && mvn -Pgenerate clean install cd kubernetes-model-generator/openshift-model-autoscaling && mvn -Pgenerate clean install cd kubernetes-model-generator/openshift-model-machine && mvn -Pgenerate clean install + cd kubernetes-model-generator/openshift-model-machineconfiguration && mvn -Pgenerate clean install # Legacy generation of the model: TODO: remove .PHONY: generate-model-legacy diff --git a/doc/MIGRATION-v7.md b/doc/MIGRATION-v7.md index dc1c6d90231..be038526752 100644 --- a/doc/MIGRATION-v7.md +++ b/doc/MIGRATION-v7.md @@ -9,6 +9,7 @@ - [Service Catalog removed (operator.openshift.io)](#service-catalog-removed) - [Removed deprecated types for network.openshift.io (OpenShift-SDN-only)](#openshift-network-removed) - [Renamed clusterautoscaling to autoscaling](#openshift-clusterautoscaling-to-autoscaling) + - [Renamed machineconfig to machineconfiguration](#openshift-machineconfig-to-machineconfiguration) - [Deprecations and Removals](#deprecations-and-removals) - [Service Catalog API (extension) removed](#service-catalog-extension) @@ -83,6 +84,14 @@ The package has also been renamed from `io.fabric8.openshift.api.model.clusterau The OpenShiftClient DSL entry-point has also been renamed from `OpenShiftClient.clusterAutoscaling()` to `OpenShiftClient.openShiftAutoscaling()`. +### Renamed machineconfig to machineconfiguration + +The module `openshift-model-machineconfig` has been renamed to `openshift-model-machineconfiguration` to match the API group name. + +The package has also been renamed from `io.fabric8.openshift.api.model.machineconfig` to `io.fabric8.openshift.api.model.machineconfiguration`. + +The OpenShiftClient DSL entry-point remains the same: `OpenShiftClient.machineConfigurations()`. + ## Deprecations and Removals ### Service Catalog API (extension) removed diff --git a/kubernetes-model-generator/generateModel.sh b/kubernetes-model-generator/generateModel.sh index ed82ce1224c..74538a1da5a 100755 --- a/kubernetes-model-generator/generateModel.sh +++ b/kubernetes-model-generator/generateModel.sh @@ -24,7 +24,6 @@ ABSOLUTE_BASEDIR=$(realpath "$BASEDIR") declare -a modules=( "openshift-model-hive" "openshift-model-installer" - "openshift-model-machineconfig" "openshift-model-monitoring" "openshift-model-tuned" "openshift-model-whereabouts" diff --git a/kubernetes-model-generator/openshift-model-machineconfig/Makefile b/kubernetes-model-generator/openshift-model-machineconfig/Makefile deleted file mode 100644 index c09a7003874..00000000000 --- a/kubernetes-model-generator/openshift-model-machineconfig/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/openshift-model-machineconfig/cmd/generate/generate.go b/kubernetes-model-generator/openshift-model-machineconfig/cmd/generate/generate.go deleted file mode 100644 index ebc2aa1dfcf..00000000000 --- a/kubernetes-model-generator/openshift-model-machineconfig/cmd/generate/generate.go +++ /dev/null @@ -1,108 +0,0 @@ -/** - * Copyright (C) 2015 Red Hat, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package main - -import ( - "bytes" - "encoding/json" - "fmt" - openshiftconfigapi "github.com/openshift/api/config/v1" - machineconfig "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - runtime "k8s.io/apimachinery/pkg/runtime" - apimachineryversion "k8s.io/apimachinery/pkg/version" - "log" - "reflect" - "strings" - "time" - - "os" - - "github.com/fabric8io/kubernetes-client/kubernetes-model-generator/pkg/schemagen" -) - -type Schema struct { - Info apimachineryversion.Info - APIGroup metav1.APIGroup - APIGroupList metav1.APIGroupList - BaseKubernetesList metav1.List - ObjectMeta metav1.ObjectMeta - TypeMeta metav1.TypeMeta - Status metav1.Status - Patch metav1.Patch - Time metav1.Time - ContainerRuntimeConfig machineconfig.ContainerRuntimeConfig - ContainerRuntimeConfigList machineconfig.ContainerRuntimeConfigList - ControllerConfig machineconfig.ControllerConfig - ControllerConfigList machineconfig.ControllerConfigList - KubeletConfig machineconfig.KubeletConfig - KubeletConfigList machineconfig.KubeletConfigList - MachineConfigPool machineconfig.MachineConfigPool - MachineConfigPoolList machineconfig.MachineConfigPoolList - MachineConfig machineconfig.MachineConfig - MachineConfigList machineconfig.MachineConfigList -} - -func main() { - packages := []schemagen.PackageDescriptor{ - {"k8s.io/api/core/v1", "", "io.fabric8.kubernetes.api.model", "kubernetes_core_", false}, - {"k8s.io/apimachinery/pkg/api/resource", "", "io.fabric8.kubernetes.api.model", "kubernetes_resource_", false}, - {"k8s.io/apimachinery/pkg/util/intstr", "", "io.fabric8.kubernetes.api.model", "kubernetes_apimachinery_pkg_util_intstr_", false}, - {"k8s.io/apimachinery/pkg/runtime", "", "io.fabric8.openshift.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/kubernetes/pkg/util", "", "io.fabric8.kubernetes.api.model", "kubernetes_util_", false}, - {"k8s.io/kubernetes/pkg/api/errors", "", "io.fabric8.kubernetes.api.model", "kubernetes_errors_", false}, - {"k8s.io/kubernetes/pkg/api/unversioned", "", "io.fabric8.kubernetes.api.model", "api_", false}, - {"k8s.io/apimachinery/pkg/apis/meta/v1", "", "io.fabric8.kubernetes.api.model", "kubernetes_apimachinery_", false}, - {"github.com/openshift/api/config/v1", "", "io.fabric8.openshift.api.model.config.v1", "os_config_v1_", false}, - {"github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1", "machineconfiguration", "io.fabric8.openshift.api.model.machineconfig.v1", "os_machineconfig_v1_", true}, - } - - typeMap := map[reflect.Type]reflect.Type{ - reflect.TypeOf(time.Time{}): reflect.TypeOf(""), - reflect.TypeOf(struct{}{}): reflect.TypeOf(""), - } - manualTypeMap := map[reflect.Type]string{ - reflect.TypeOf(runtime.RawExtension{}): "java.util.Map", - reflect.TypeOf(openshiftconfigapi.MTUMigration{}): "io.fabric8.openshift.api.model.config.v1.NetworkStatusMMtu", - reflect.TypeOf(openshiftconfigapi.TLSSecurityProfile{}): "io.fabric8.openshift.api.model.config.v1.APIServerSpecTlsSecurityProfile", - } - schema, err := schemagen.GenerateSchema(reflect.TypeOf(Schema{}), packages, typeMap, manualTypeMap, "machineconfig") - 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/openshift-model-machineconfig/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java deleted file mode 100644 index c0f3198b1b4..00000000000 --- a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ /dev/null @@ -1,282 +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.version.Info; -import io.fabric8.openshift.api.model.machineconfig.v1.ContainerRuntimeConfig; -import io.fabric8.openshift.api.model.machineconfig.v1.ContainerRuntimeConfigList; -import io.fabric8.openshift.api.model.machineconfig.v1.ControllerConfig; -import io.fabric8.openshift.api.model.machineconfig.v1.ControllerConfigList; -import io.fabric8.openshift.api.model.machineconfig.v1.KubeletConfig; -import io.fabric8.openshift.api.model.machineconfig.v1.KubeletConfigList; -import io.fabric8.openshift.api.model.machineconfig.v1.MachineConfig; -import io.fabric8.openshift.api.model.machineconfig.v1.MachineConfigList; -import io.fabric8.openshift.api.model.machineconfig.v1.MachineConfigPool; -import io.fabric8.openshift.api.model.machineconfig.v1.MachineConfigPoolList; - -@Generated("jsonschema2pojo") -public class KubeSchema { - - private APIGroup aPIGroup; - private APIGroupList aPIGroupList; - private KubernetesList baseKubernetesList; - private ContainerRuntimeConfig containerRuntimeConfig; - private ContainerRuntimeConfigList containerRuntimeConfigList; - private ControllerConfig controllerConfig; - private ControllerConfigList controllerConfigList; - private Info info; - private KubeletConfig kubeletConfig; - private KubeletConfigList kubeletConfigList; - private MachineConfig machineConfig; - private MachineConfigList machineConfigList; - private MachineConfigPool machineConfigPool; - private MachineConfigPoolList machineConfigPoolList; - private ObjectMeta objectMeta; - private Patch patch; - private Status status; - private String time; - private TypeMeta typeMeta; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public KubeSchema() { - } - - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, ContainerRuntimeConfig containerRuntimeConfig, ContainerRuntimeConfigList containerRuntimeConfigList, ControllerConfig controllerConfig, ControllerConfigList controllerConfigList, Info info, KubeletConfig kubeletConfig, KubeletConfigList kubeletConfigList, MachineConfig machineConfig, MachineConfigList machineConfigList, MachineConfigPool machineConfigPool, MachineConfigPoolList machineConfigPoolList, ObjectMeta objectMeta, Patch patch, Status status, String time, TypeMeta typeMeta) { - super(); - this.aPIGroup = aPIGroup; - this.aPIGroupList = aPIGroupList; - this.baseKubernetesList = baseKubernetesList; - this.containerRuntimeConfig = containerRuntimeConfig; - this.containerRuntimeConfigList = containerRuntimeConfigList; - this.controllerConfig = controllerConfig; - this.controllerConfigList = controllerConfigList; - this.info = info; - this.kubeletConfig = kubeletConfig; - this.kubeletConfigList = kubeletConfigList; - this.machineConfig = machineConfig; - this.machineConfigList = machineConfigList; - this.machineConfigPool = machineConfigPool; - this.machineConfigPoolList = machineConfigPoolList; - this.objectMeta = objectMeta; - this.patch = patch; - this.status = status; - this.time = time; - this.typeMeta = typeMeta; - } - - @JsonProperty("APIGroup") - public APIGroup getAPIGroup() { - return aPIGroup; - } - - @JsonProperty("APIGroup") - public void setAPIGroup(APIGroup aPIGroup) { - this.aPIGroup = aPIGroup; - } - - @JsonProperty("APIGroupList") - public APIGroupList getAPIGroupList() { - return aPIGroupList; - } - - @JsonProperty("APIGroupList") - public void setAPIGroupList(APIGroupList aPIGroupList) { - this.aPIGroupList = aPIGroupList; - } - - @JsonProperty("BaseKubernetesList") - public KubernetesList getBaseKubernetesList() { - return baseKubernetesList; - } - - @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(KubernetesList baseKubernetesList) { - this.baseKubernetesList = baseKubernetesList; - } - - @JsonProperty("ContainerRuntimeConfig") - public ContainerRuntimeConfig getContainerRuntimeConfig() { - return containerRuntimeConfig; - } - - @JsonProperty("ContainerRuntimeConfig") - public void setContainerRuntimeConfig(ContainerRuntimeConfig containerRuntimeConfig) { - this.containerRuntimeConfig = containerRuntimeConfig; - } - - @JsonProperty("ContainerRuntimeConfigList") - public ContainerRuntimeConfigList getContainerRuntimeConfigList() { - return containerRuntimeConfigList; - } - - @JsonProperty("ContainerRuntimeConfigList") - public void setContainerRuntimeConfigList(ContainerRuntimeConfigList containerRuntimeConfigList) { - this.containerRuntimeConfigList = containerRuntimeConfigList; - } - - @JsonProperty("ControllerConfig") - public ControllerConfig getControllerConfig() { - return controllerConfig; - } - - @JsonProperty("ControllerConfig") - public void setControllerConfig(ControllerConfig controllerConfig) { - this.controllerConfig = controllerConfig; - } - - @JsonProperty("ControllerConfigList") - public ControllerConfigList getControllerConfigList() { - return controllerConfigList; - } - - @JsonProperty("ControllerConfigList") - public void setControllerConfigList(ControllerConfigList controllerConfigList) { - this.controllerConfigList = controllerConfigList; - } - - @JsonProperty("Info") - public Info getInfo() { - return info; - } - - @JsonProperty("Info") - public void setInfo(Info info) { - this.info = info; - } - - @JsonProperty("KubeletConfig") - public KubeletConfig getKubeletConfig() { - return kubeletConfig; - } - - @JsonProperty("KubeletConfig") - public void setKubeletConfig(KubeletConfig kubeletConfig) { - this.kubeletConfig = kubeletConfig; - } - - @JsonProperty("KubeletConfigList") - public KubeletConfigList getKubeletConfigList() { - return kubeletConfigList; - } - - @JsonProperty("KubeletConfigList") - public void setKubeletConfigList(KubeletConfigList kubeletConfigList) { - this.kubeletConfigList = kubeletConfigList; - } - - @JsonProperty("MachineConfig") - public MachineConfig getMachineConfig() { - return machineConfig; - } - - @JsonProperty("MachineConfig") - public void setMachineConfig(MachineConfig machineConfig) { - this.machineConfig = machineConfig; - } - - @JsonProperty("MachineConfigList") - public MachineConfigList getMachineConfigList() { - return machineConfigList; - } - - @JsonProperty("MachineConfigList") - public void setMachineConfigList(MachineConfigList machineConfigList) { - this.machineConfigList = machineConfigList; - } - - @JsonProperty("MachineConfigPool") - public MachineConfigPool getMachineConfigPool() { - return machineConfigPool; - } - - @JsonProperty("MachineConfigPool") - public void setMachineConfigPool(MachineConfigPool machineConfigPool) { - this.machineConfigPool = machineConfigPool; - } - - @JsonProperty("MachineConfigPoolList") - public MachineConfigPoolList getMachineConfigPoolList() { - return machineConfigPoolList; - } - - @JsonProperty("MachineConfigPoolList") - public void setMachineConfigPoolList(MachineConfigPoolList machineConfigPoolList) { - this.machineConfigPoolList = machineConfigPoolList; - } - - @JsonProperty("ObjectMeta") - public ObjectMeta getObjectMeta() { - return objectMeta; - } - - @JsonProperty("ObjectMeta") - public void setObjectMeta(ObjectMeta objectMeta) { - this.objectMeta = objectMeta; - } - - @JsonProperty("Patch") - public Patch getPatch() { - return patch; - } - - @JsonProperty("Patch") - public void setPatch(Patch patch) { - this.patch = patch; - } - - @JsonProperty("Status") - public Status getStatus() { - return status; - } - - @JsonProperty("Status") - public void setStatus(Status status) { - this.status = status; - } - - @JsonProperty("Time") - public String getTime() { - return time; - } - - @JsonProperty("Time") - public void setTime(String time) { - this.time = time; - } - - @JsonProperty("TypeMeta") - public TypeMeta getTypeMeta() { - return typeMeta; - } - - @JsonProperty("TypeMeta") - public void setTypeMeta(TypeMeta typeMeta) { - this.typeMeta = typeMeta; - } - - @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/openshift-model-machineconfig/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java deleted file mode 100644 index 876ce593ce1..00000000000 --- a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ /dev/null @@ -1,282 +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.version.Info; -import io.fabric8.openshift.api.model.machineconfig.v1.ContainerRuntimeConfig; -import io.fabric8.openshift.api.model.machineconfig.v1.ContainerRuntimeConfigList; -import io.fabric8.openshift.api.model.machineconfig.v1.ControllerConfig; -import io.fabric8.openshift.api.model.machineconfig.v1.ControllerConfigList; -import io.fabric8.openshift.api.model.machineconfig.v1.KubeletConfig; -import io.fabric8.openshift.api.model.machineconfig.v1.KubeletConfigList; -import io.fabric8.openshift.api.model.machineconfig.v1.MachineConfig; -import io.fabric8.openshift.api.model.machineconfig.v1.MachineConfigList; -import io.fabric8.openshift.api.model.machineconfig.v1.MachineConfigPool; -import io.fabric8.openshift.api.model.machineconfig.v1.MachineConfigPoolList; - -@Generated("jsonschema2pojo") -public class ValidationSchema { - - private APIGroup aPIGroup; - private APIGroupList aPIGroupList; - private KubernetesList baseKubernetesList; - private ContainerRuntimeConfig containerRuntimeConfig; - private ContainerRuntimeConfigList containerRuntimeConfigList; - private ControllerConfig controllerConfig; - private ControllerConfigList controllerConfigList; - private Info info; - private KubeletConfig kubeletConfig; - private KubeletConfigList kubeletConfigList; - private MachineConfig machineConfig; - private MachineConfigList machineConfigList; - private MachineConfigPool machineConfigPool; - private MachineConfigPoolList machineConfigPoolList; - private ObjectMeta objectMeta; - private Patch patch; - private Status status; - private String time; - private TypeMeta typeMeta; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ValidationSchema() { - } - - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, ContainerRuntimeConfig containerRuntimeConfig, ContainerRuntimeConfigList containerRuntimeConfigList, ControllerConfig controllerConfig, ControllerConfigList controllerConfigList, Info info, KubeletConfig kubeletConfig, KubeletConfigList kubeletConfigList, MachineConfig machineConfig, MachineConfigList machineConfigList, MachineConfigPool machineConfigPool, MachineConfigPoolList machineConfigPoolList, ObjectMeta objectMeta, Patch patch, Status status, String time, TypeMeta typeMeta) { - super(); - this.aPIGroup = aPIGroup; - this.aPIGroupList = aPIGroupList; - this.baseKubernetesList = baseKubernetesList; - this.containerRuntimeConfig = containerRuntimeConfig; - this.containerRuntimeConfigList = containerRuntimeConfigList; - this.controllerConfig = controllerConfig; - this.controllerConfigList = controllerConfigList; - this.info = info; - this.kubeletConfig = kubeletConfig; - this.kubeletConfigList = kubeletConfigList; - this.machineConfig = machineConfig; - this.machineConfigList = machineConfigList; - this.machineConfigPool = machineConfigPool; - this.machineConfigPoolList = machineConfigPoolList; - this.objectMeta = objectMeta; - this.patch = patch; - this.status = status; - this.time = time; - this.typeMeta = typeMeta; - } - - @JsonProperty("APIGroup") - public APIGroup getAPIGroup() { - return aPIGroup; - } - - @JsonProperty("APIGroup") - public void setAPIGroup(APIGroup aPIGroup) { - this.aPIGroup = aPIGroup; - } - - @JsonProperty("APIGroupList") - public APIGroupList getAPIGroupList() { - return aPIGroupList; - } - - @JsonProperty("APIGroupList") - public void setAPIGroupList(APIGroupList aPIGroupList) { - this.aPIGroupList = aPIGroupList; - } - - @JsonProperty("BaseKubernetesList") - public KubernetesList getBaseKubernetesList() { - return baseKubernetesList; - } - - @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(KubernetesList baseKubernetesList) { - this.baseKubernetesList = baseKubernetesList; - } - - @JsonProperty("ContainerRuntimeConfig") - public ContainerRuntimeConfig getContainerRuntimeConfig() { - return containerRuntimeConfig; - } - - @JsonProperty("ContainerRuntimeConfig") - public void setContainerRuntimeConfig(ContainerRuntimeConfig containerRuntimeConfig) { - this.containerRuntimeConfig = containerRuntimeConfig; - } - - @JsonProperty("ContainerRuntimeConfigList") - public ContainerRuntimeConfigList getContainerRuntimeConfigList() { - return containerRuntimeConfigList; - } - - @JsonProperty("ContainerRuntimeConfigList") - public void setContainerRuntimeConfigList(ContainerRuntimeConfigList containerRuntimeConfigList) { - this.containerRuntimeConfigList = containerRuntimeConfigList; - } - - @JsonProperty("ControllerConfig") - public ControllerConfig getControllerConfig() { - return controllerConfig; - } - - @JsonProperty("ControllerConfig") - public void setControllerConfig(ControllerConfig controllerConfig) { - this.controllerConfig = controllerConfig; - } - - @JsonProperty("ControllerConfigList") - public ControllerConfigList getControllerConfigList() { - return controllerConfigList; - } - - @JsonProperty("ControllerConfigList") - public void setControllerConfigList(ControllerConfigList controllerConfigList) { - this.controllerConfigList = controllerConfigList; - } - - @JsonProperty("Info") - public Info getInfo() { - return info; - } - - @JsonProperty("Info") - public void setInfo(Info info) { - this.info = info; - } - - @JsonProperty("KubeletConfig") - public KubeletConfig getKubeletConfig() { - return kubeletConfig; - } - - @JsonProperty("KubeletConfig") - public void setKubeletConfig(KubeletConfig kubeletConfig) { - this.kubeletConfig = kubeletConfig; - } - - @JsonProperty("KubeletConfigList") - public KubeletConfigList getKubeletConfigList() { - return kubeletConfigList; - } - - @JsonProperty("KubeletConfigList") - public void setKubeletConfigList(KubeletConfigList kubeletConfigList) { - this.kubeletConfigList = kubeletConfigList; - } - - @JsonProperty("MachineConfig") - public MachineConfig getMachineConfig() { - return machineConfig; - } - - @JsonProperty("MachineConfig") - public void setMachineConfig(MachineConfig machineConfig) { - this.machineConfig = machineConfig; - } - - @JsonProperty("MachineConfigList") - public MachineConfigList getMachineConfigList() { - return machineConfigList; - } - - @JsonProperty("MachineConfigList") - public void setMachineConfigList(MachineConfigList machineConfigList) { - this.machineConfigList = machineConfigList; - } - - @JsonProperty("MachineConfigPool") - public MachineConfigPool getMachineConfigPool() { - return machineConfigPool; - } - - @JsonProperty("MachineConfigPool") - public void setMachineConfigPool(MachineConfigPool machineConfigPool) { - this.machineConfigPool = machineConfigPool; - } - - @JsonProperty("MachineConfigPoolList") - public MachineConfigPoolList getMachineConfigPoolList() { - return machineConfigPoolList; - } - - @JsonProperty("MachineConfigPoolList") - public void setMachineConfigPoolList(MachineConfigPoolList machineConfigPoolList) { - this.machineConfigPoolList = machineConfigPoolList; - } - - @JsonProperty("ObjectMeta") - public ObjectMeta getObjectMeta() { - return objectMeta; - } - - @JsonProperty("ObjectMeta") - public void setObjectMeta(ObjectMeta objectMeta) { - this.objectMeta = objectMeta; - } - - @JsonProperty("Patch") - public Patch getPatch() { - return patch; - } - - @JsonProperty("Patch") - public void setPatch(Patch patch) { - this.patch = patch; - } - - @JsonProperty("Status") - public Status getStatus() { - return status; - } - - @JsonProperty("Status") - public void setStatus(Status status) { - this.status = status; - } - - @JsonProperty("Time") - public String getTime() { - return time; - } - - @JsonProperty("Time") - public void setTime(String time) { - this.time = time; - } - - @JsonProperty("TypeMeta") - public TypeMeta getTypeMeta() { - return typeMeta; - } - - @JsonProperty("TypeMeta") - public void setTypeMeta(TypeMeta typeMeta) { - this.typeMeta = typeMeta; - } - - @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/openshift-model-machineconfig/pom.xml b/kubernetes-model-generator/openshift-model-machineconfiguration/pom.xml similarity index 56% rename from kubernetes-model-generator/openshift-model-machineconfig/pom.xml rename to kubernetes-model-generator/openshift-model-machineconfiguration/pom.xml index 7d78643910a..0246c28c278 100644 --- a/kubernetes-model-generator/openshift-model-machineconfig/pom.xml +++ b/kubernetes-model-generator/openshift-model-machineconfiguration/pom.xml @@ -26,7 +26,7 @@ 7.0-SNAPSHOT - openshift-model-machineconfig + openshift-model-machineconfiguration bundle Fabric8 :: OpenShift Machine Config Operator Model @@ -34,7 +34,7 @@ true * - io.fabric8.openshift.api.model.machineconfig**, + io.fabric8.openshift.api.model.machineconfiguration**, @@ -43,41 +43,33 @@ io.fabric8 kubernetes-model-core - - io.fabric8 - kubernetes-model-common - - - io.fabric8 - openshift-model-config - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifacts - - false - - - - - - - generate - org.jsonschema2pojo - jsonschema2pojo-maven-plugin + io.fabric8 + openapi-model-generator-maven-plugin + + + + ${openapi.schema.openshift-latest} + + + io.fabric8.kubernetes.api.model + io.fabric8.openshift.api.model.machineconfiguration + + + ^io\.openshift\.machineconfiguration\..*$ + + + io.fabric8.kubernetes.api.model.LabelSelectorRequirement + + + diff --git a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/ContainerRuntimeConfig.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ContainerRuntimeConfig.java similarity index 92% rename from kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/ContainerRuntimeConfig.java rename to kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ContainerRuntimeConfig.java index 6ba666a948b..fc95c269fbf 100644 --- a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/ContainerRuntimeConfig.java +++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ContainerRuntimeConfig.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.machineconfig.v1; +package io.fabric8.openshift.api.model.machineconfiguration.v1; import java.util.LinkedHashMap; import java.util.Map; @@ -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 ContainerRuntimeConfig implements Editable , KubernetesResource, KubernetesResourceList +public class ContainerRuntimeConfigList implements Editable , KubernetesResource, KubernetesResourceList { /** @@ -79,7 +79,7 @@ public class ContainerRuntimeConfigList implements Editable items = new ArrayList<>(); + private List items = new ArrayList<>(); /** * * (Required) @@ -99,7 +99,7 @@ public class ContainerRuntimeConfigList implements Editable items, String kind, ListMeta metadata) { + public ContainerRuntimeConfigList(String apiVersion, List items, String kind, ListMeta metadata) { super(); this.apiVersion = apiVersion; this.items = items; @@ -129,12 +129,12 @@ public void setApiVersion(String apiVersion) { @JsonProperty("items") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getItems() { + public List getItems() { return items; } @JsonProperty("items") - public void setItems(List items) { + public void setItems(List items) { this.items = items; } diff --git a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/ContainerRuntimeConfigSpec.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ContainerRuntimeConfigSpec.java similarity index 81% rename from kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/ContainerRuntimeConfigSpec.java rename to kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ContainerRuntimeConfigSpec.java index b6205822b13..789606e9170 100644 --- a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/ContainerRuntimeConfigSpec.java +++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ContainerRuntimeConfigSpec.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.machineconfig.v1; +package io.fabric8.openshift.api.model.machineconfiguration.v1; import java.util.LinkedHashMap; import java.util.Map; @@ -15,6 +15,7 @@ import io.fabric8.kubernetes.api.model.Container; import io.fabric8.kubernetes.api.model.IntOrString; import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; import io.fabric8.kubernetes.api.model.LocalObjectReference; import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; @@ -41,7 +42,7 @@ }) @Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { @BuildableReference(ObjectMeta.class), - @BuildableReference(io.fabric8.kubernetes.api.model.LabelSelector.class), + @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @BuildableReference(ResourceRequirements.class), @@ -55,9 +56,9 @@ public class ContainerRuntimeConfigSpec implements Editable additionalProperties = new LinkedHashMap(); @@ -68,29 +69,29 @@ public class ContainerRuntimeConfigSpec implements Editable , KubernetesResource +public class ContainerRuntimeConfigSpecContainerRuntimeConfig implements Editable , KubernetesResource { @JsonProperty("defaultRuntime") @@ -64,9 +63,11 @@ public class ContainerRuntimeConfiguration implements Editable , KubernetesResource +{ + + @JsonProperty("matchExpressions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List matchExpressions = new ArrayList<>(); + @JsonProperty("matchLabels") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private Map matchLabels = new LinkedHashMap<>(); + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ContainerRuntimeConfigSpecMachineConfigPoolSelector() { + } + + public ContainerRuntimeConfigSpecMachineConfigPoolSelector(List matchExpressions, Map matchLabels) { + super(); + this.matchExpressions = matchExpressions; + this.matchLabels = matchLabels; + } + + @JsonProperty("matchExpressions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getMatchExpressions() { + return matchExpressions; + } + + @JsonProperty("matchExpressions") + public void setMatchExpressions(List matchExpressions) { + this.matchExpressions = matchExpressions; + } + + @JsonProperty("matchLabels") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public Map getMatchLabels() { + return matchLabels; + } + + @JsonProperty("matchLabels") + public void setMatchLabels(Map matchLabels) { + this.matchLabels = matchLabels; + } + + @JsonIgnore + public ContainerRuntimeConfigSpecMachineConfigPoolSelectorBuilder edit() { + return new ContainerRuntimeConfigSpecMachineConfigPoolSelectorBuilder(this); + } + + @JsonIgnore + public ContainerRuntimeConfigSpecMachineConfigPoolSelectorBuilder 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/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/ContainerRuntimeConfigStatus.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ContainerRuntimeConfigStatus.java similarity index 91% rename from kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/ContainerRuntimeConfigStatus.java rename to kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ContainerRuntimeConfigStatus.java index 5874d482ff4..116108721ef 100644 --- a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/ContainerRuntimeConfigStatus.java +++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ContainerRuntimeConfigStatus.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.machineconfig.v1; +package io.fabric8.openshift.api.model.machineconfiguration.v1; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -59,7 +59,7 @@ public class ContainerRuntimeConfigStatus implements Editable conditions = new ArrayList<>(); + private List conditions = new ArrayList<>(); @JsonProperty("observedGeneration") private Long observedGeneration; @JsonIgnore @@ -72,7 +72,7 @@ public class ContainerRuntimeConfigStatus implements Editable conditions, Long observedGeneration) { + public ContainerRuntimeConfigStatus(List conditions, Long observedGeneration) { super(); this.conditions = conditions; this.observedGeneration = observedGeneration; @@ -80,12 +80,12 @@ public ContainerRuntimeConfigStatus(List condit @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getConditions() { + public List getConditions() { return conditions; } @JsonProperty("conditions") - public void setConditions(List conditions) { + public void setConditions(List conditions) { this.conditions = conditions; } diff --git a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/MachineConfigPoolCondition.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ContainerRuntimeConfigStatusConditions.java similarity index 82% rename from kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/MachineConfigPoolCondition.java rename to kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ContainerRuntimeConfigStatusConditions.java index c62af05fc1b..92b6f809e5e 100644 --- a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/MachineConfigPoolCondition.java +++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ContainerRuntimeConfigStatusConditions.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.machineconfig.v1; +package io.fabric8.openshift.api.model.machineconfiguration.v1; import java.util.LinkedHashMap; import java.util.Map; @@ -55,11 +55,12 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class MachineConfigPoolCondition implements Editable , KubernetesResource +public class ContainerRuntimeConfigStatusConditions implements Editable , KubernetesResource { @JsonProperty("lastTransitionTime") - private String lastTransitionTime; + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + private Object lastTransitionTime; @JsonProperty("message") private String message; @JsonProperty("reason") @@ -75,10 +76,10 @@ public class MachineConfigPoolCondition implements Editable , Has @JsonProperty("kind") private String kind = "ControllerConfig"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("spec") private ControllerConfigSpec spec; @JsonProperty("status") @@ -96,7 +97,7 @@ public class ControllerConfig implements Editable , Has public ControllerConfig() { } - public ControllerConfig(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, ControllerConfigSpec spec, ControllerConfigStatus status) { + public ControllerConfig(String apiVersion, String kind, ObjectMeta metadata, ControllerConfigSpec spec, ControllerConfigStatus 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/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/ControllerConfigList.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigList.java similarity index 91% rename from kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/ControllerConfigList.java rename to kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigList.java index 75d654b59d4..45d6e28de8f 100644 --- a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/ControllerConfigList.java +++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigList.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.machineconfig.v1; +package io.fabric8.openshift.api.model.machineconfiguration.v1; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -67,7 +67,7 @@ @Version("v1") @Group("machineconfiguration.openshift.io") @Generated("jsonschema2pojo") -public class ControllerConfigList implements Editable , KubernetesResource, KubernetesResourceList +public class ControllerConfigList implements Editable , KubernetesResource, KubernetesResourceList { /** @@ -79,7 +79,7 @@ public class ControllerConfigList implements Editable items = new ArrayList<>(); + private List items = new ArrayList<>(); /** * * (Required) @@ -99,7 +99,7 @@ public class ControllerConfigList implements Editable items, String kind, ListMeta metadata) { + public ControllerConfigList(String apiVersion, List items, String kind, ListMeta metadata) { super(); this.apiVersion = apiVersion; this.items = items; @@ -129,12 +129,12 @@ public void setApiVersion(String apiVersion) { @JsonProperty("items") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getItems() { + public List getItems() { return items; } @JsonProperty("items") - public void setItems(List items) { + public void setItems(List items) { this.items = items; } diff --git a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/ControllerConfigSpec.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigSpec.java similarity index 73% rename from kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/ControllerConfigSpec.java rename to kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigSpec.java index bd2b402d099..edeafbaa012 100644 --- a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/ControllerConfigSpec.java +++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigSpec.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.machineconfig.v1; +package io.fabric8.openshift.api.model.machineconfiguration.v1; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -20,12 +20,10 @@ 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.fabric8.openshift.api.model.config.v1.DNS; -import io.fabric8.openshift.api.model.config.v1.Infrastructure; -import io.fabric8.openshift.api.model.config.v1.ProxyStatus; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; import lombok.EqualsAndHashCode; @@ -47,6 +45,7 @@ "imageRegistryBundleUserData", "images", "infra", + "internalRegistryPullSecret", "ipFamilies", "kubeAPIServerServingCAData", "network", @@ -71,7 +70,7 @@ @BuildableReference(PodTemplateSpec.class), @BuildableReference(ResourceRequirements.class), @BuildableReference(IntOrString.class), - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class), + @BuildableReference(ObjectReference.class), @BuildableReference(LocalObjectReference.class), @BuildableReference(PersistentVolumeClaim.class) }) @@ -80,38 +79,44 @@ public class ControllerConfigSpec implements Editable imageRegistryBundleData = new ArrayList<>(); + private List imageRegistryBundleData = new ArrayList<>(); @JsonProperty("imageRegistryBundleUserData") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List imageRegistryBundleUserData = new ArrayList<>(); + private List imageRegistryBundleUserData = new ArrayList<>(); @JsonProperty("images") @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map images = new LinkedHashMap<>(); @JsonProperty("infra") - private Infrastructure infra; + private ControllerConfigSpecInfra infra; + @JsonProperty("internalRegistryPullSecret") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + private Object internalRegistryPullSecret; @JsonProperty("ipFamilies") private String ipFamilies; @JsonProperty("kubeAPIServerServingCAData") private String kubeAPIServerServingCAData; @JsonProperty("network") - private NetworkInfo network; + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + private Object network; @JsonProperty("networkType") private String networkType; @JsonProperty("osImageURL") @@ -119,9 +124,10 @@ public class ControllerConfigSpec implements Editable imageRegistryBundleData, List imageRegistryBundleUserData, Map images, Infrastructure infra, String ipFamilies, String kubeAPIServerServingCAData, NetworkInfo network, String networkType, String osImageURL, String platform, ProxyStatus proxy, io.fabric8.kubernetes.api.model.ObjectReference pullSecret, String releaseImage, String rootCAData) { + public ControllerConfigSpec(Object additionalTrustBundle, String baseOSContainerImage, String baseOSExtensionsContainerImage, Object cloudProviderCAData, String cloudProviderConfig, String clusterDNSIP, ControllerConfigSpecDns dns, String etcdDiscoveryDomain, List imageRegistryBundleData, List imageRegistryBundleUserData, Map images, ControllerConfigSpecInfra infra, Object internalRegistryPullSecret, String ipFamilies, String kubeAPIServerServingCAData, Object network, String networkType, String osImageURL, String platform, Object proxy, ControllerConfigSpecPullSecret pullSecret, String releaseImage, String rootCAData) { super(); this.additionalTrustBundle = additionalTrustBundle; this.baseOSContainerImage = baseOSContainerImage; @@ -150,6 +156,7 @@ public ControllerConfigSpec(String additionalTrustBundle, String baseOSContainer this.imageRegistryBundleUserData = imageRegistryBundleUserData; this.images = images; this.infra = infra; + this.internalRegistryPullSecret = internalRegistryPullSecret; this.ipFamilies = ipFamilies; this.kubeAPIServerServingCAData = kubeAPIServerServingCAData; this.network = network; @@ -163,12 +170,13 @@ public ControllerConfigSpec(String additionalTrustBundle, String baseOSContainer } @JsonProperty("additionalTrustBundle") - public String getAdditionalTrustBundle() { + public Object getAdditionalTrustBundle() { return additionalTrustBundle; } @JsonProperty("additionalTrustBundle") - public void setAdditionalTrustBundle(String additionalTrustBundle) { + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + public void setAdditionalTrustBundle(Object additionalTrustBundle) { this.additionalTrustBundle = additionalTrustBundle; } @@ -193,12 +201,13 @@ public void setBaseOSExtensionsContainerImage(String baseOSExtensionsContainerIm } @JsonProperty("cloudProviderCAData") - public String getCloudProviderCAData() { + public Object getCloudProviderCAData() { return cloudProviderCAData; } @JsonProperty("cloudProviderCAData") - public void setCloudProviderCAData(String cloudProviderCAData) { + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + public void setCloudProviderCAData(Object cloudProviderCAData) { this.cloudProviderCAData = cloudProviderCAData; } @@ -223,12 +232,12 @@ public void setClusterDNSIP(String clusterDNSIP) { } @JsonProperty("dns") - public DNS getDns() { + public ControllerConfigSpecDns getDns() { return dns; } @JsonProperty("dns") - public void setDns(DNS dns) { + public void setDns(ControllerConfigSpecDns dns) { this.dns = dns; } @@ -244,23 +253,23 @@ public void setEtcdDiscoveryDomain(String etcdDiscoveryDomain) { @JsonProperty("imageRegistryBundleData") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getImageRegistryBundleData() { + public List getImageRegistryBundleData() { return imageRegistryBundleData; } @JsonProperty("imageRegistryBundleData") - public void setImageRegistryBundleData(List imageRegistryBundleData) { + public void setImageRegistryBundleData(List imageRegistryBundleData) { this.imageRegistryBundleData = imageRegistryBundleData; } @JsonProperty("imageRegistryBundleUserData") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getImageRegistryBundleUserData() { + public List getImageRegistryBundleUserData() { return imageRegistryBundleUserData; } @JsonProperty("imageRegistryBundleUserData") - public void setImageRegistryBundleUserData(List imageRegistryBundleUserData) { + public void setImageRegistryBundleUserData(List imageRegistryBundleUserData) { this.imageRegistryBundleUserData = imageRegistryBundleUserData; } @@ -276,15 +285,26 @@ public void setImages(Map images) { } @JsonProperty("infra") - public Infrastructure getInfra() { + public ControllerConfigSpecInfra getInfra() { return infra; } @JsonProperty("infra") - public void setInfra(Infrastructure infra) { + public void setInfra(ControllerConfigSpecInfra infra) { this.infra = infra; } + @JsonProperty("internalRegistryPullSecret") + public Object getInternalRegistryPullSecret() { + return internalRegistryPullSecret; + } + + @JsonProperty("internalRegistryPullSecret") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + public void setInternalRegistryPullSecret(Object internalRegistryPullSecret) { + this.internalRegistryPullSecret = internalRegistryPullSecret; + } + @JsonProperty("ipFamilies") public String getIpFamilies() { return ipFamilies; @@ -306,12 +326,13 @@ public void setKubeAPIServerServingCAData(String kubeAPIServerServingCAData) { } @JsonProperty("network") - public NetworkInfo getNetwork() { + public Object getNetwork() { return network; } @JsonProperty("network") - public void setNetwork(NetworkInfo network) { + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + public void setNetwork(Object network) { this.network = network; } @@ -346,22 +367,23 @@ public void setPlatform(String platform) { } @JsonProperty("proxy") - public ProxyStatus getProxy() { + public Object getProxy() { return proxy; } @JsonProperty("proxy") - public void setProxy(ProxyStatus proxy) { + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + public void setProxy(Object proxy) { this.proxy = proxy; } @JsonProperty("pullSecret") - public io.fabric8.kubernetes.api.model.ObjectReference getPullSecret() { + public ControllerConfigSpecPullSecret getPullSecret() { return pullSecret; } @JsonProperty("pullSecret") - public void setPullSecret(io.fabric8.kubernetes.api.model.ObjectReference pullSecret) { + public void setPullSecret(ControllerConfigSpecPullSecret pullSecret) { this.pullSecret = pullSecret; } diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigSpecDns.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigSpecDns.java new file mode 100644 index 00000000000..d15009328b8 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigSpecDns.java @@ -0,0 +1,136 @@ + +package io.fabric8.openshift.api.model.machineconfiguration.v1; + +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({ + "apiVersion", + "kind", + "metadata" +}) +@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 ControllerConfigSpecDns implements Editable , KubernetesResource +{ + + @JsonProperty("apiVersion") + private String apiVersion; + @JsonProperty("kind") + private String kind; + @JsonProperty("metadata") + private ObjectMeta metadata; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ControllerConfigSpecDns() { + } + + public ControllerConfigSpecDns(String apiVersion, String kind, ObjectMeta metadata) { + super(); + this.apiVersion = apiVersion; + this.kind = kind; + this.metadata = metadata; + } + + @JsonProperty("apiVersion") + public String getApiVersion() { + return apiVersion; + } + + @JsonProperty("apiVersion") + public void setApiVersion(String apiVersion) { + this.apiVersion = apiVersion; + } + + @JsonProperty("kind") + public String getKind() { + return kind; + } + + @JsonProperty("kind") + public void setKind(String kind) { + this.kind = kind; + } + + @JsonProperty("metadata") + public ObjectMeta getMetadata() { + return metadata; + } + + @JsonProperty("metadata") + public void setMetadata(ObjectMeta metadata) { + this.metadata = metadata; + } + + @JsonIgnore + public ControllerConfigSpecDnsBuilder edit() { + return new ControllerConfigSpecDnsBuilder(this); + } + + @JsonIgnore + public ControllerConfigSpecDnsBuilder 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/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/ImageRegistryBundle.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigSpecImageRegistryBundleData.java similarity index 85% rename from kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/ImageRegistryBundle.java rename to kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigSpecImageRegistryBundleData.java index 47dd7368ec2..44fa73703d0 100644 --- a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/ImageRegistryBundle.java +++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigSpecImageRegistryBundleData.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.machineconfig.v1; +package io.fabric8.openshift.api.model.machineconfiguration.v1; import java.util.LinkedHashMap; import java.util.Map; @@ -52,7 +52,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ImageRegistryBundle implements Editable , KubernetesResource +public class ControllerConfigSpecImageRegistryBundleData implements Editable , KubernetesResource { @JsonProperty("data") @@ -66,10 +66,10 @@ public class ImageRegistryBundle implements Editable * No args constructor for use in serialization * */ - public ImageRegistryBundle() { + public ControllerConfigSpecImageRegistryBundleData() { } - public ImageRegistryBundle(String data, String file) { + public ControllerConfigSpecImageRegistryBundleData(String data, String file) { super(); this.data = data; this.file = file; @@ -96,12 +96,12 @@ public void setFile(String file) { } @JsonIgnore - public ImageRegistryBundleBuilder edit() { - return new ImageRegistryBundleBuilder(this); + public ControllerConfigSpecImageRegistryBundleDataBuilder edit() { + return new ControllerConfigSpecImageRegistryBundleDataBuilder(this); } @JsonIgnore - public ImageRegistryBundleBuilder toBuilder() { + public ControllerConfigSpecImageRegistryBundleDataBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/NetworkInfo.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigSpecImageRegistryBundleUserData.java similarity index 71% rename from kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/NetworkInfo.java rename to kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigSpecImageRegistryBundleUserData.java index 74b335dfa80..c232daa3ed9 100644 --- a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/NetworkInfo.java +++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigSpecImageRegistryBundleUserData.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.machineconfig.v1; +package io.fabric8.openshift.api.model.machineconfiguration.v1; import java.util.LinkedHashMap; import java.util.Map; @@ -22,7 +22,6 @@ import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.fabric8.openshift.api.model.config.v1.NetworkStatusMMtu; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; import lombok.EqualsAndHashCode; @@ -32,7 +31,8 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "mtuMigration" + "data", + "file" }) @ToString @EqualsAndHashCode @@ -52,11 +52,13 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class NetworkInfo implements Editable , KubernetesResource +public class ControllerConfigSpecImageRegistryBundleUserData implements Editable , KubernetesResource { - @JsonProperty("mtuMigration") - private NetworkStatusMMtu mtuMigration; + @JsonProperty("data") + private String data; + @JsonProperty("file") + private String file; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -64,31 +66,42 @@ public class NetworkInfo implements Editable , KubernetesRes * No args constructor for use in serialization * */ - public NetworkInfo() { + public ControllerConfigSpecImageRegistryBundleUserData() { } - public NetworkInfo(NetworkStatusMMtu mtuMigration) { + public ControllerConfigSpecImageRegistryBundleUserData(String data, String file) { super(); - this.mtuMigration = mtuMigration; + this.data = data; + this.file = file; } - @JsonProperty("mtuMigration") - public NetworkStatusMMtu getMtuMigration() { - return mtuMigration; + @JsonProperty("data") + public String getData() { + return data; } - @JsonProperty("mtuMigration") - public void setMtuMigration(NetworkStatusMMtu mtuMigration) { - this.mtuMigration = mtuMigration; + @JsonProperty("data") + public void setData(String data) { + this.data = data; + } + + @JsonProperty("file") + public String getFile() { + return file; + } + + @JsonProperty("file") + public void setFile(String file) { + this.file = file; } @JsonIgnore - public NetworkInfoBuilder edit() { - return new NetworkInfoBuilder(this); + public ControllerConfigSpecImageRegistryBundleUserDataBuilder edit() { + return new ControllerConfigSpecImageRegistryBundleUserDataBuilder(this); } @JsonIgnore - public NetworkInfoBuilder toBuilder() { + public ControllerConfigSpecImageRegistryBundleUserDataBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigSpecInfra.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigSpecInfra.java new file mode 100644 index 00000000000..431824d752b --- /dev/null +++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigSpecInfra.java @@ -0,0 +1,136 @@ + +package io.fabric8.openshift.api.model.machineconfiguration.v1; + +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({ + "apiVersion", + "kind", + "metadata" +}) +@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 ControllerConfigSpecInfra implements Editable , KubernetesResource +{ + + @JsonProperty("apiVersion") + private String apiVersion; + @JsonProperty("kind") + private String kind; + @JsonProperty("metadata") + private ObjectMeta metadata; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ControllerConfigSpecInfra() { + } + + public ControllerConfigSpecInfra(String apiVersion, String kind, ObjectMeta metadata) { + super(); + this.apiVersion = apiVersion; + this.kind = kind; + this.metadata = metadata; + } + + @JsonProperty("apiVersion") + public String getApiVersion() { + return apiVersion; + } + + @JsonProperty("apiVersion") + public void setApiVersion(String apiVersion) { + this.apiVersion = apiVersion; + } + + @JsonProperty("kind") + public String getKind() { + return kind; + } + + @JsonProperty("kind") + public void setKind(String kind) { + this.kind = kind; + } + + @JsonProperty("metadata") + public ObjectMeta getMetadata() { + return metadata; + } + + @JsonProperty("metadata") + public void setMetadata(ObjectMeta metadata) { + this.metadata = metadata; + } + + @JsonIgnore + public ControllerConfigSpecInfraBuilder edit() { + return new ControllerConfigSpecInfraBuilder(this); + } + + @JsonIgnore + public ControllerConfigSpecInfraBuilder 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/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigSpecPullSecret.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigSpecPullSecret.java new file mode 100644 index 00000000000..203731b8257 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigSpecPullSecret.java @@ -0,0 +1,192 @@ + +package io.fabric8.openshift.api.model.machineconfiguration.v1; + +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({ + "apiVersion", + "kind", + "fieldPath", + "name", + "namespace", + "resourceVersion", + "uid" +}) +@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 ControllerConfigSpecPullSecret implements Editable , KubernetesResource +{ + + @JsonProperty("apiVersion") + private String apiVersion; + @JsonProperty("fieldPath") + private String fieldPath; + @JsonProperty("kind") + private String kind; + @JsonProperty("name") + private String name; + @JsonProperty("namespace") + private String namespace; + @JsonProperty("resourceVersion") + private String resourceVersion; + @JsonProperty("uid") + private String uid; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ControllerConfigSpecPullSecret() { + } + + public ControllerConfigSpecPullSecret(String apiVersion, String fieldPath, String kind, String name, String namespace, String resourceVersion, String uid) { + super(); + this.apiVersion = apiVersion; + this.fieldPath = fieldPath; + this.kind = kind; + this.name = name; + this.namespace = namespace; + this.resourceVersion = resourceVersion; + this.uid = uid; + } + + @JsonProperty("apiVersion") + public String getApiVersion() { + return apiVersion; + } + + @JsonProperty("apiVersion") + public void setApiVersion(String apiVersion) { + this.apiVersion = apiVersion; + } + + @JsonProperty("fieldPath") + public String getFieldPath() { + return fieldPath; + } + + @JsonProperty("fieldPath") + public void setFieldPath(String fieldPath) { + this.fieldPath = fieldPath; + } + + @JsonProperty("kind") + public String getKind() { + return kind; + } + + @JsonProperty("kind") + public void setKind(String kind) { + this.kind = kind; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonProperty("namespace") + public String getNamespace() { + return namespace; + } + + @JsonProperty("namespace") + public void setNamespace(String namespace) { + this.namespace = namespace; + } + + @JsonProperty("resourceVersion") + public String getResourceVersion() { + return resourceVersion; + } + + @JsonProperty("resourceVersion") + public void setResourceVersion(String resourceVersion) { + this.resourceVersion = resourceVersion; + } + + @JsonProperty("uid") + public String getUid() { + return uid; + } + + @JsonProperty("uid") + public void setUid(String uid) { + this.uid = uid; + } + + @JsonIgnore + public ControllerConfigSpecPullSecretBuilder edit() { + return new ControllerConfigSpecPullSecretBuilder(this); + } + + @JsonIgnore + public ControllerConfigSpecPullSecretBuilder 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/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/ControllerConfigStatus.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigStatus.java similarity index 87% rename from kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/ControllerConfigStatus.java rename to kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigStatus.java index 0d366f3f06a..4a8b441cc6f 100644 --- a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/ControllerConfigStatus.java +++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigStatus.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.machineconfig.v1; +package io.fabric8.openshift.api.model.machineconfiguration.v1; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -60,10 +60,10 @@ public class ControllerConfigStatus implements Editable conditions = new ArrayList<>(); + private List conditions = new ArrayList<>(); @JsonProperty("controllerCertificates") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List controllerCertificates = new ArrayList<>(); + private List controllerCertificates = new ArrayList<>(); @JsonProperty("observedGeneration") private Long observedGeneration; @JsonIgnore @@ -76,7 +76,7 @@ public class ControllerConfigStatus implements Editable conditions, List controllerCertificates, Long observedGeneration) { + public ControllerConfigStatus(List conditions, List controllerCertificates, Long observedGeneration) { super(); this.conditions = conditions; this.controllerCertificates = controllerCertificates; @@ -85,23 +85,23 @@ public ControllerConfigStatus(List conditions, @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getConditions() { + public List getConditions() { return conditions; } @JsonProperty("conditions") - public void setConditions(List conditions) { + public void setConditions(List conditions) { this.conditions = conditions; } @JsonProperty("controllerCertificates") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getControllerCertificates() { + public List getControllerCertificates() { return controllerCertificates; } @JsonProperty("controllerCertificates") - public void setControllerCertificates(List controllerCertificates) { + public void setControllerCertificates(List controllerCertificates) { this.controllerCertificates = controllerCertificates; } diff --git a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/ControllerConfigStatusCondition.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigStatusConditions.java similarity index 83% rename from kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/ControllerConfigStatusCondition.java rename to kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigStatusConditions.java index 76dbf3ffe58..6c32611d75a 100644 --- a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/ControllerConfigStatusCondition.java +++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/ControllerConfigStatusConditions.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.machineconfig.v1; +package io.fabric8.openshift.api.model.machineconfiguration.v1; import java.util.LinkedHashMap; import java.util.Map; @@ -55,11 +55,12 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ControllerConfigStatusCondition implements Editable , KubernetesResource +public class ControllerConfigStatusConditions implements Editable , KubernetesResource { @JsonProperty("lastTransitionTime") - private String lastTransitionTime; + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + private Object lastTransitionTime; @JsonProperty("message") private String message; @JsonProperty("reason") @@ -75,10 +76,10 @@ public class ControllerConfigStatusCondition implements Editable , KubernetesResource +public class ControllerConfigStatusControllerCertificates implements Editable , KubernetesResource { @JsonProperty("bundleFile") @@ -75,10 +75,10 @@ public class ControllerCertificate implements Editable , HasMetada @JsonProperty("kind") private String kind = "KubeletConfig"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("spec") private KubeletConfigSpec spec; @JsonProperty("status") @@ -96,7 +97,7 @@ public class KubeletConfig implements Editable , HasMetada public KubeletConfig() { } - public KubeletConfig(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, KubeletConfigSpec spec, KubeletConfigStatus status) { + public KubeletConfig(String apiVersion, String kind, ObjectMeta metadata, KubeletConfigSpec spec, KubeletConfigStatus 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/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/KubeletConfigList.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/KubeletConfigList.java similarity index 91% rename from kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/KubeletConfigList.java rename to kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/KubeletConfigList.java index 87dd225e873..576ff0e0e33 100644 --- a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/KubeletConfigList.java +++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/KubeletConfigList.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.machineconfig.v1; +package io.fabric8.openshift.api.model.machineconfiguration.v1; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -67,7 +67,7 @@ @Version("v1") @Group("machineconfiguration.openshift.io") @Generated("jsonschema2pojo") -public class KubeletConfigList implements Editable , KubernetesResource, KubernetesResourceList +public class KubeletConfigList implements Editable , KubernetesResource, KubernetesResourceList { /** @@ -79,7 +79,7 @@ public class KubeletConfigList implements Editable , K private String apiVersion = "machineconfiguration.openshift.io/v1"; @JsonProperty("items") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List items = new ArrayList<>(); + private List items = new ArrayList<>(); /** * * (Required) @@ -99,7 +99,7 @@ public class KubeletConfigList implements Editable , K public KubeletConfigList() { } - public KubeletConfigList(String apiVersion, List items, String kind, ListMeta metadata) { + public KubeletConfigList(String apiVersion, List items, String kind, ListMeta metadata) { super(); this.apiVersion = apiVersion; this.items = items; @@ -129,12 +129,12 @@ public void setApiVersion(String apiVersion) { @JsonProperty("items") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getItems() { + public List getItems() { return items; } @JsonProperty("items") - public void setItems(List items) { + public void setItems(List items) { this.items = items; } diff --git a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/KubeletConfigSpec.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/KubeletConfigSpec.java similarity index 72% rename from kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/KubeletConfigSpec.java rename to kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/KubeletConfigSpec.java index e56e7eba19e..1359e95f9c8 100644 --- a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/KubeletConfigSpec.java +++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/KubeletConfigSpec.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.machineconfig.v1; +package io.fabric8.openshift.api.model.machineconfiguration.v1; import java.util.LinkedHashMap; import java.util.Map; @@ -15,13 +15,13 @@ 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.fabric8.openshift.api.model.config.v1.APIServerSpecTlsSecurityProfile; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; import lombok.EqualsAndHashCode; @@ -45,7 +45,7 @@ }) @Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { @BuildableReference(ObjectMeta.class), - @BuildableReference(io.fabric8.kubernetes.api.model.LabelSelector.class), + @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @BuildableReference(ResourceRequirements.class), @@ -61,16 +61,16 @@ public class KubeletConfigSpec implements Editable , K @JsonProperty("autoSizingReserved") private Boolean autoSizingReserved; @JsonProperty("kubeletConfig") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Map kubeletConfig = new LinkedHashMap<>(); + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + private Object kubeletConfig; @JsonProperty("logLevel") private Integer logLevel; @JsonProperty("machineConfigPoolSelector") - private io.fabric8.kubernetes.api.model.LabelSelector machineConfigPoolSelector; + private KubeletConfigSpecMachineConfigPoolSelector machineConfigPoolSelector; @JsonProperty("tlsSecurityProfile") - private APIServerSpecTlsSecurityProfile tlsSecurityProfile; + private KubeletConfigSpecTlsSecurityProfile tlsSecurityProfile; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -79,7 +79,7 @@ public class KubeletConfigSpec implements Editable , K public KubeletConfigSpec() { } - public KubeletConfigSpec(Boolean autoSizingReserved, Map kubeletConfig, Integer logLevel, io.fabric8.kubernetes.api.model.LabelSelector machineConfigPoolSelector, APIServerSpecTlsSecurityProfile tlsSecurityProfile) { + public KubeletConfigSpec(Boolean autoSizingReserved, Object kubeletConfig, Integer logLevel, KubeletConfigSpecMachineConfigPoolSelector machineConfigPoolSelector, KubeletConfigSpecTlsSecurityProfile tlsSecurityProfile) { super(); this.autoSizingReserved = autoSizingReserved; this.kubeletConfig = kubeletConfig; @@ -99,13 +99,13 @@ public void setAutoSizingReserved(Boolean autoSizingReserved) { } @JsonProperty("kubeletConfig") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public Map getKubeletConfig() { + public Object getKubeletConfig() { return kubeletConfig; } @JsonProperty("kubeletConfig") - public void setKubeletConfig(Map kubeletConfig) { + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + public void setKubeletConfig(Object kubeletConfig) { this.kubeletConfig = kubeletConfig; } @@ -120,22 +120,22 @@ public void setLogLevel(Integer logLevel) { } @JsonProperty("machineConfigPoolSelector") - public io.fabric8.kubernetes.api.model.LabelSelector getMachineConfigPoolSelector() { + public KubeletConfigSpecMachineConfigPoolSelector getMachineConfigPoolSelector() { return machineConfigPoolSelector; } @JsonProperty("machineConfigPoolSelector") - public void setMachineConfigPoolSelector(io.fabric8.kubernetes.api.model.LabelSelector machineConfigPoolSelector) { + public void setMachineConfigPoolSelector(KubeletConfigSpecMachineConfigPoolSelector machineConfigPoolSelector) { this.machineConfigPoolSelector = machineConfigPoolSelector; } @JsonProperty("tlsSecurityProfile") - public APIServerSpecTlsSecurityProfile getTlsSecurityProfile() { + public KubeletConfigSpecTlsSecurityProfile getTlsSecurityProfile() { return tlsSecurityProfile; } @JsonProperty("tlsSecurityProfile") - public void setTlsSecurityProfile(APIServerSpecTlsSecurityProfile tlsSecurityProfile) { + public void setTlsSecurityProfile(KubeletConfigSpecTlsSecurityProfile tlsSecurityProfile) { this.tlsSecurityProfile = tlsSecurityProfile; } @@ -150,16 +150,16 @@ public KubeletConfigSpecBuilder toBuilder() { } @JsonAnyGetter - public Map getAdditionalProperties() { + public Map getAdditionalProperties() { return this.additionalProperties; } @JsonAnySetter - public void setAdditionalProperty(java.lang.String name, java.lang.Object value) { + public void setAdditionalProperty(String name, Object value) { this.additionalProperties.put(name, value); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/KubeletConfigSpecMachineConfigPoolSelector.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/KubeletConfigSpecMachineConfigPoolSelector.java new file mode 100644 index 00000000000..60f8b2f0abe --- /dev/null +++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/KubeletConfigSpecMachineConfigPoolSelector.java @@ -0,0 +1,129 @@ + +package io.fabric8.openshift.api.model.machineconfiguration.v1; + +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.LabelSelectorRequirement; +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({ + "matchExpressions", + "matchLabels" +}) +@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 KubeletConfigSpecMachineConfigPoolSelector implements Editable , KubernetesResource +{ + + @JsonProperty("matchExpressions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List matchExpressions = new ArrayList<>(); + @JsonProperty("matchLabels") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private Map matchLabels = new LinkedHashMap<>(); + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public KubeletConfigSpecMachineConfigPoolSelector() { + } + + public KubeletConfigSpecMachineConfigPoolSelector(List matchExpressions, Map matchLabels) { + super(); + this.matchExpressions = matchExpressions; + this.matchLabels = matchLabels; + } + + @JsonProperty("matchExpressions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getMatchExpressions() { + return matchExpressions; + } + + @JsonProperty("matchExpressions") + public void setMatchExpressions(List matchExpressions) { + this.matchExpressions = matchExpressions; + } + + @JsonProperty("matchLabels") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public Map getMatchLabels() { + return matchLabels; + } + + @JsonProperty("matchLabels") + public void setMatchLabels(Map matchLabels) { + this.matchLabels = matchLabels; + } + + @JsonIgnore + public KubeletConfigSpecMachineConfigPoolSelectorBuilder edit() { + return new KubeletConfigSpecMachineConfigPoolSelectorBuilder(this); + } + + @JsonIgnore + public KubeletConfigSpecMachineConfigPoolSelectorBuilder 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/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/KubeletConfigSpecTlsSecurityProfile.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/KubeletConfigSpecTlsSecurityProfile.java new file mode 100644 index 00000000000..5e996d618f7 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/KubeletConfigSpecTlsSecurityProfile.java @@ -0,0 +1,172 @@ + +package io.fabric8.openshift.api.model.machineconfiguration.v1; + +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({ + "custom", + "intermediate", + "modern", + "old", + "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 KubeletConfigSpecTlsSecurityProfile implements Editable , KubernetesResource +{ + + @JsonProperty("custom") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + private Object custom; + @JsonProperty("intermediate") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + private Object intermediate; + @JsonProperty("modern") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + private Object modern; + @JsonProperty("old") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + private Object old; + @JsonProperty("type") + private String type; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public KubeletConfigSpecTlsSecurityProfile() { + } + + public KubeletConfigSpecTlsSecurityProfile(Object custom, Object intermediate, Object modern, Object old, String type) { + super(); + this.custom = custom; + this.intermediate = intermediate; + this.modern = modern; + this.old = old; + this.type = type; + } + + @JsonProperty("custom") + public Object getCustom() { + return custom; + } + + @JsonProperty("custom") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + public void setCustom(Object custom) { + this.custom = custom; + } + + @JsonProperty("intermediate") + public Object getIntermediate() { + return intermediate; + } + + @JsonProperty("intermediate") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + public void setIntermediate(Object intermediate) { + this.intermediate = intermediate; + } + + @JsonProperty("modern") + public Object getModern() { + return modern; + } + + @JsonProperty("modern") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + public void setModern(Object modern) { + this.modern = modern; + } + + @JsonProperty("old") + public Object getOld() { + return old; + } + + @JsonProperty("old") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + public void setOld(Object old) { + this.old = old; + } + + @JsonProperty("type") + public String getType() { + return type; + } + + @JsonProperty("type") + public void setType(String type) { + this.type = type; + } + + @JsonIgnore + public KubeletConfigSpecTlsSecurityProfileBuilder edit() { + return new KubeletConfigSpecTlsSecurityProfileBuilder(this); + } + + @JsonIgnore + public KubeletConfigSpecTlsSecurityProfileBuilder 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/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/KubeletConfigStatus.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/KubeletConfigStatus.java similarity index 91% rename from kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/KubeletConfigStatus.java rename to kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/KubeletConfigStatus.java index ef39e87b7cf..cc8e1e05d74 100644 --- a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/KubeletConfigStatus.java +++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/KubeletConfigStatus.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.machineconfig.v1; +package io.fabric8.openshift.api.model.machineconfiguration.v1; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -59,7 +59,7 @@ public class KubeletConfigStatus implements Editable @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List conditions = new ArrayList<>(); + private List conditions = new ArrayList<>(); @JsonProperty("observedGeneration") private Long observedGeneration; @JsonIgnore @@ -72,7 +72,7 @@ public class KubeletConfigStatus implements Editable public KubeletConfigStatus() { } - public KubeletConfigStatus(List conditions, Long observedGeneration) { + public KubeletConfigStatus(List conditions, Long observedGeneration) { super(); this.conditions = conditions; this.observedGeneration = observedGeneration; @@ -80,12 +80,12 @@ public KubeletConfigStatus(List conditions, Long observe @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getConditions() { + public List getConditions() { return conditions; } @JsonProperty("conditions") - public void setConditions(List conditions) { + public void setConditions(List conditions) { this.conditions = conditions; } diff --git a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/ContainerRuntimeConfigCondition.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/KubeletConfigStatusConditions.java similarity index 83% rename from kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/ContainerRuntimeConfigCondition.java rename to kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/KubeletConfigStatusConditions.java index a955dc67d11..64329c02ef2 100644 --- a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/ContainerRuntimeConfigCondition.java +++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/KubeletConfigStatusConditions.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.machineconfig.v1; +package io.fabric8.openshift.api.model.machineconfiguration.v1; import java.util.LinkedHashMap; import java.util.Map; @@ -55,11 +55,12 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ContainerRuntimeConfigCondition implements Editable , KubernetesResource +public class KubeletConfigStatusConditions implements Editable , KubernetesResource { @JsonProperty("lastTransitionTime") - private String lastTransitionTime; + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + private Object lastTransitionTime; @JsonProperty("message") private String message; @JsonProperty("reason") @@ -75,10 +76,10 @@ public class ContainerRuntimeConfigCondition implements Editable , HasMetada @JsonProperty("kind") private String kind = "MachineConfig"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("spec") private MachineConfigSpec spec; @JsonIgnore @@ -93,7 +94,7 @@ public class MachineConfig implements Editable , HasMetada public MachineConfig() { } - public MachineConfig(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, MachineConfigSpec spec) { + public MachineConfig(String apiVersion, String kind, ObjectMeta metadata, MachineConfigSpec spec) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -142,12 +143,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/MachineConfigList.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigList.java similarity index 91% rename from kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/MachineConfigList.java rename to kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigList.java index 750e780e73e..44e411455ef 100644 --- a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/MachineConfigList.java +++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigList.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.machineconfig.v1; +package io.fabric8.openshift.api.model.machineconfiguration.v1; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -67,7 +67,7 @@ @Version("v1") @Group("machineconfiguration.openshift.io") @Generated("jsonschema2pojo") -public class MachineConfigList implements Editable , KubernetesResource, KubernetesResourceList +public class MachineConfigList implements Editable , KubernetesResource, KubernetesResourceList { /** @@ -79,7 +79,7 @@ public class MachineConfigList implements Editable , K private String apiVersion = "machineconfiguration.openshift.io/v1"; @JsonProperty("items") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List items = new ArrayList<>(); + private List items = new ArrayList<>(); /** * * (Required) @@ -99,7 +99,7 @@ public class MachineConfigList implements Editable , K public MachineConfigList() { } - public MachineConfigList(String apiVersion, List items, String kind, ListMeta metadata) { + public MachineConfigList(String apiVersion, List items, String kind, ListMeta metadata) { super(); this.apiVersion = apiVersion; this.items = items; @@ -129,12 +129,12 @@ public void setApiVersion(String apiVersion) { @JsonProperty("items") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getItems() { + public List getItems() { return items; } @JsonProperty("items") - public void setItems(List items) { + public void setItems(List items) { this.items = items; } diff --git a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/MachineConfigPool.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPool.java similarity index 91% rename from kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/MachineConfigPool.java rename to kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPool.java index 8f2be578884..56e29feab73 100644 --- a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/MachineConfigPool.java +++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPool.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.machineconfig.v1; +package io.fabric8.openshift.api.model.machineconfiguration.v1; import java.util.LinkedHashMap; import java.util.Map; @@ -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 MachineConfigPool implements Editable , H @JsonProperty("kind") private String kind = "MachineConfigPool"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("spec") private MachineConfigPoolSpec spec; @JsonProperty("status") @@ -96,7 +97,7 @@ public class MachineConfigPool implements Editable , H public MachineConfigPool() { } - public MachineConfigPool(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, MachineConfigPoolSpec spec, MachineConfigPoolStatus status) { + public MachineConfigPool(String apiVersion, String kind, ObjectMeta metadata, MachineConfigPoolSpec spec, MachineConfigPoolStatus 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/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/MachineConfigPoolList.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolList.java similarity index 91% rename from kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/MachineConfigPoolList.java rename to kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolList.java index de7eb909bf1..ee113f70e04 100644 --- a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/MachineConfigPoolList.java +++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolList.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.machineconfig.v1; +package io.fabric8.openshift.api.model.machineconfiguration.v1; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -67,7 +67,7 @@ @Version("v1") @Group("machineconfiguration.openshift.io") @Generated("jsonschema2pojo") -public class MachineConfigPoolList implements Editable , KubernetesResource, KubernetesResourceList +public class MachineConfigPoolList implements Editable , KubernetesResource, KubernetesResourceList { /** @@ -79,7 +79,7 @@ public class MachineConfigPoolList implements Editable items = new ArrayList<>(); + private List items = new ArrayList<>(); /** * * (Required) @@ -99,7 +99,7 @@ public class MachineConfigPoolList implements Editable items, String kind, ListMeta metadata) { + public MachineConfigPoolList(String apiVersion, List items, String kind, ListMeta metadata) { super(); this.apiVersion = apiVersion; this.items = items; @@ -129,12 +129,12 @@ public void setApiVersion(String apiVersion) { @JsonProperty("items") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getItems() { + public List getItems() { return items; } @JsonProperty("items") - public void setItems(List items) { + public void setItems(List items) { this.items = items; } diff --git a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/MachineConfigPoolSpec.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolSpec.java similarity index 74% rename from kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/MachineConfigPoolSpec.java rename to kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolSpec.java index 4652077ea18..3a9962db119 100644 --- a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/MachineConfigPoolSpec.java +++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolSpec.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.machineconfig.v1; +package io.fabric8.openshift.api.model.machineconfiguration.v1; import java.util.LinkedHashMap; import java.util.Map; @@ -13,7 +13,9 @@ 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; @@ -43,11 +45,11 @@ }) @Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { @BuildableReference(ObjectMeta.class), - @BuildableReference(io.fabric8.kubernetes.api.model.LabelSelector.class), + @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @BuildableReference(ResourceRequirements.class), - @BuildableReference(io.fabric8.kubernetes.api.model.IntOrString.class), + @BuildableReference(IntOrString.class), @BuildableReference(ObjectReference.class), @BuildableReference(LocalObjectReference.class), @BuildableReference(PersistentVolumeClaim.class) @@ -57,13 +59,14 @@ public class MachineConfigPoolSpec implements Editable , KubernetesResource +{ + + @JsonProperty("apiVersion") + private String apiVersion; + @JsonProperty("fieldPath") + private String fieldPath; + @JsonProperty("kind") + private String kind; + @JsonProperty("name") + private String name; + @JsonProperty("namespace") + private String namespace; + @JsonProperty("resourceVersion") + private String resourceVersion; + @JsonProperty("uid") + private String uid; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public MachineConfigPoolSpecCSource() { + } + + public MachineConfigPoolSpecCSource(String apiVersion, String fieldPath, String kind, String name, String namespace, String resourceVersion, String uid) { + super(); + this.apiVersion = apiVersion; + this.fieldPath = fieldPath; + this.kind = kind; + this.name = name; + this.namespace = namespace; + this.resourceVersion = resourceVersion; + this.uid = uid; + } + + @JsonProperty("apiVersion") + public String getApiVersion() { + return apiVersion; + } + + @JsonProperty("apiVersion") + public void setApiVersion(String apiVersion) { + this.apiVersion = apiVersion; + } + + @JsonProperty("fieldPath") + public String getFieldPath() { + return fieldPath; + } + + @JsonProperty("fieldPath") + public void setFieldPath(String fieldPath) { + this.fieldPath = fieldPath; + } + + @JsonProperty("kind") + public String getKind() { + return kind; + } + + @JsonProperty("kind") + public void setKind(String kind) { + this.kind = kind; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonProperty("namespace") + public String getNamespace() { + return namespace; + } + + @JsonProperty("namespace") + public void setNamespace(String namespace) { + this.namespace = namespace; + } + + @JsonProperty("resourceVersion") + public String getResourceVersion() { + return resourceVersion; + } + + @JsonProperty("resourceVersion") + public void setResourceVersion(String resourceVersion) { + this.resourceVersion = resourceVersion; + } + + @JsonProperty("uid") + public String getUid() { + return uid; + } + + @JsonProperty("uid") + public void setUid(String uid) { + this.uid = uid; + } + + @JsonIgnore + public MachineConfigPoolSpecCSourceBuilder edit() { + return new MachineConfigPoolSpecCSourceBuilder(this); + } + + @JsonIgnore + public MachineConfigPoolSpecCSourceBuilder 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/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolSpecConfiguration.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolSpecConfiguration.java new file mode 100644 index 00000000000..a5c639eb921 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolSpecConfiguration.java @@ -0,0 +1,210 @@ + +package io.fabric8.openshift.api.model.machineconfiguration.v1; + +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({ + "apiVersion", + "kind", + "fieldPath", + "name", + "namespace", + "resourceVersion", + "source", + "uid" +}) +@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 MachineConfigPoolSpecConfiguration implements Editable , KubernetesResource +{ + + @JsonProperty("apiVersion") + private String apiVersion; + @JsonProperty("fieldPath") + private String fieldPath; + @JsonProperty("kind") + private String kind; + @JsonProperty("name") + private String name; + @JsonProperty("namespace") + private String namespace; + @JsonProperty("resourceVersion") + private String resourceVersion; + @JsonProperty("source") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List source = new ArrayList<>(); + @JsonProperty("uid") + private String uid; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public MachineConfigPoolSpecConfiguration() { + } + + public MachineConfigPoolSpecConfiguration(String apiVersion, String fieldPath, String kind, String name, String namespace, String resourceVersion, List source, String uid) { + super(); + this.apiVersion = apiVersion; + this.fieldPath = fieldPath; + this.kind = kind; + this.name = name; + this.namespace = namespace; + this.resourceVersion = resourceVersion; + this.source = source; + this.uid = uid; + } + + @JsonProperty("apiVersion") + public String getApiVersion() { + return apiVersion; + } + + @JsonProperty("apiVersion") + public void setApiVersion(String apiVersion) { + this.apiVersion = apiVersion; + } + + @JsonProperty("fieldPath") + public String getFieldPath() { + return fieldPath; + } + + @JsonProperty("fieldPath") + public void setFieldPath(String fieldPath) { + this.fieldPath = fieldPath; + } + + @JsonProperty("kind") + public String getKind() { + return kind; + } + + @JsonProperty("kind") + public void setKind(String kind) { + this.kind = kind; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonProperty("namespace") + public String getNamespace() { + return namespace; + } + + @JsonProperty("namespace") + public void setNamespace(String namespace) { + this.namespace = namespace; + } + + @JsonProperty("resourceVersion") + public String getResourceVersion() { + return resourceVersion; + } + + @JsonProperty("resourceVersion") + public void setResourceVersion(String resourceVersion) { + this.resourceVersion = resourceVersion; + } + + @JsonProperty("source") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getSource() { + return source; + } + + @JsonProperty("source") + public void setSource(List source) { + this.source = source; + } + + @JsonProperty("uid") + public String getUid() { + return uid; + } + + @JsonProperty("uid") + public void setUid(String uid) { + this.uid = uid; + } + + @JsonIgnore + public MachineConfigPoolSpecConfigurationBuilder edit() { + return new MachineConfigPoolSpecConfigurationBuilder(this); + } + + @JsonIgnore + public MachineConfigPoolSpecConfigurationBuilder 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/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolSpecMachineConfigSelector.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolSpecMachineConfigSelector.java new file mode 100644 index 00000000000..96b325bccc4 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolSpecMachineConfigSelector.java @@ -0,0 +1,129 @@ + +package io.fabric8.openshift.api.model.machineconfiguration.v1; + +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.LabelSelectorRequirement; +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({ + "matchExpressions", + "matchLabels" +}) +@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 MachineConfigPoolSpecMachineConfigSelector implements Editable , KubernetesResource +{ + + @JsonProperty("matchExpressions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List matchExpressions = new ArrayList<>(); + @JsonProperty("matchLabels") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private Map matchLabels = new LinkedHashMap<>(); + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public MachineConfigPoolSpecMachineConfigSelector() { + } + + public MachineConfigPoolSpecMachineConfigSelector(List matchExpressions, Map matchLabels) { + super(); + this.matchExpressions = matchExpressions; + this.matchLabels = matchLabels; + } + + @JsonProperty("matchExpressions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getMatchExpressions() { + return matchExpressions; + } + + @JsonProperty("matchExpressions") + public void setMatchExpressions(List matchExpressions) { + this.matchExpressions = matchExpressions; + } + + @JsonProperty("matchLabels") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public Map getMatchLabels() { + return matchLabels; + } + + @JsonProperty("matchLabels") + public void setMatchLabels(Map matchLabels) { + this.matchLabels = matchLabels; + } + + @JsonIgnore + public MachineConfigPoolSpecMachineConfigSelectorBuilder edit() { + return new MachineConfigPoolSpecMachineConfigSelectorBuilder(this); + } + + @JsonIgnore + public MachineConfigPoolSpecMachineConfigSelectorBuilder 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/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolSpecNodeSelector.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolSpecNodeSelector.java new file mode 100644 index 00000000000..7d5f8c87753 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolSpecNodeSelector.java @@ -0,0 +1,129 @@ + +package io.fabric8.openshift.api.model.machineconfiguration.v1; + +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.LabelSelectorRequirement; +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({ + "matchExpressions", + "matchLabels" +}) +@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 MachineConfigPoolSpecNodeSelector implements Editable , KubernetesResource +{ + + @JsonProperty("matchExpressions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List matchExpressions = new ArrayList<>(); + @JsonProperty("matchLabels") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private Map matchLabels = new LinkedHashMap<>(); + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public MachineConfigPoolSpecNodeSelector() { + } + + public MachineConfigPoolSpecNodeSelector(List matchExpressions, Map matchLabels) { + super(); + this.matchExpressions = matchExpressions; + this.matchLabels = matchLabels; + } + + @JsonProperty("matchExpressions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getMatchExpressions() { + return matchExpressions; + } + + @JsonProperty("matchExpressions") + public void setMatchExpressions(List matchExpressions) { + this.matchExpressions = matchExpressions; + } + + @JsonProperty("matchLabels") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public Map getMatchLabels() { + return matchLabels; + } + + @JsonProperty("matchLabels") + public void setMatchLabels(Map matchLabels) { + this.matchLabels = matchLabels; + } + + @JsonIgnore + public MachineConfigPoolSpecNodeSelectorBuilder edit() { + return new MachineConfigPoolSpecNodeSelectorBuilder(this); + } + + @JsonIgnore + public MachineConfigPoolSpecNodeSelectorBuilder 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/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/MachineConfigPoolStatus.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolStatus.java similarity index 88% rename from kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/MachineConfigPoolStatus.java rename to kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolStatus.java index e3479e45d2a..f5b414bcde5 100644 --- a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/MachineConfigPoolStatus.java +++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolStatus.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.machineconfig.v1; +package io.fabric8.openshift.api.model.machineconfiguration.v1; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -66,10 +66,10 @@ public class MachineConfigPoolStatus implements Editable certExpirys = new ArrayList<>(); + private List certExpirys = new ArrayList<>(); @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List conditions = new ArrayList<>(); + private List conditions = new ArrayList<>(); @JsonProperty("configuration") private MachineConfigPoolStatusConfiguration configuration; @JsonProperty("degradedMachineCount") @@ -94,7 +94,7 @@ public class MachineConfigPoolStatus implements Editable certExpirys, List conditions, MachineConfigPoolStatusConfiguration configuration, Integer degradedMachineCount, Integer machineCount, Long observedGeneration, Integer readyMachineCount, Integer unavailableMachineCount, Integer updatedMachineCount) { + public MachineConfigPoolStatus(List certExpirys, List conditions, MachineConfigPoolStatusConfiguration configuration, Integer degradedMachineCount, Integer machineCount, Long observedGeneration, Integer readyMachineCount, Integer unavailableMachineCount, Integer updatedMachineCount) { super(); this.certExpirys = certExpirys; this.conditions = conditions; @@ -109,23 +109,23 @@ public MachineConfigPoolStatus(List certExpirys, List getCertExpirys() { + public List getCertExpirys() { return certExpirys; } @JsonProperty("certExpirys") - public void setCertExpirys(List certExpirys) { + public void setCertExpirys(List certExpirys) { this.certExpirys = certExpirys; } @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getConditions() { + public List getConditions() { return conditions; } @JsonProperty("conditions") - public void setConditions(List conditions) { + public void setConditions(List conditions) { this.conditions = conditions; } diff --git a/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolStatusCSource.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolStatusCSource.java new file mode 100644 index 00000000000..58c34481a56 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolStatusCSource.java @@ -0,0 +1,192 @@ + +package io.fabric8.openshift.api.model.machineconfiguration.v1; + +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({ + "apiVersion", + "kind", + "fieldPath", + "name", + "namespace", + "resourceVersion", + "uid" +}) +@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 MachineConfigPoolStatusCSource implements Editable , KubernetesResource +{ + + @JsonProperty("apiVersion") + private String apiVersion; + @JsonProperty("fieldPath") + private String fieldPath; + @JsonProperty("kind") + private String kind; + @JsonProperty("name") + private String name; + @JsonProperty("namespace") + private String namespace; + @JsonProperty("resourceVersion") + private String resourceVersion; + @JsonProperty("uid") + private String uid; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public MachineConfigPoolStatusCSource() { + } + + public MachineConfigPoolStatusCSource(String apiVersion, String fieldPath, String kind, String name, String namespace, String resourceVersion, String uid) { + super(); + this.apiVersion = apiVersion; + this.fieldPath = fieldPath; + this.kind = kind; + this.name = name; + this.namespace = namespace; + this.resourceVersion = resourceVersion; + this.uid = uid; + } + + @JsonProperty("apiVersion") + public String getApiVersion() { + return apiVersion; + } + + @JsonProperty("apiVersion") + public void setApiVersion(String apiVersion) { + this.apiVersion = apiVersion; + } + + @JsonProperty("fieldPath") + public String getFieldPath() { + return fieldPath; + } + + @JsonProperty("fieldPath") + public void setFieldPath(String fieldPath) { + this.fieldPath = fieldPath; + } + + @JsonProperty("kind") + public String getKind() { + return kind; + } + + @JsonProperty("kind") + public void setKind(String kind) { + this.kind = kind; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonProperty("namespace") + public String getNamespace() { + return namespace; + } + + @JsonProperty("namespace") + public void setNamespace(String namespace) { + this.namespace = namespace; + } + + @JsonProperty("resourceVersion") + public String getResourceVersion() { + return resourceVersion; + } + + @JsonProperty("resourceVersion") + public void setResourceVersion(String resourceVersion) { + this.resourceVersion = resourceVersion; + } + + @JsonProperty("uid") + public String getUid() { + return uid; + } + + @JsonProperty("uid") + public void setUid(String uid) { + this.uid = uid; + } + + @JsonIgnore + public MachineConfigPoolStatusCSourceBuilder edit() { + return new MachineConfigPoolStatusCSourceBuilder(this); + } + + @JsonIgnore + public MachineConfigPoolStatusCSourceBuilder 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/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/CertExpiry.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolStatusCertExpirys.java similarity index 87% rename from kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/CertExpiry.java rename to kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolStatusCertExpirys.java index f217c3b6417..8503fe46629 100644 --- a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/CertExpiry.java +++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolStatusCertExpirys.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.machineconfig.v1; +package io.fabric8.openshift.api.model.machineconfiguration.v1; import java.util.LinkedHashMap; import java.util.Map; @@ -53,7 +53,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class CertExpiry implements Editable , KubernetesResource +public class MachineConfigPoolStatusCertExpirys implements Editable , KubernetesResource { @JsonProperty("bundle") @@ -69,10 +69,10 @@ public class CertExpiry implements Editable , KubernetesResou * No args constructor for use in serialization * */ - public CertExpiry() { + public MachineConfigPoolStatusCertExpirys() { } - public CertExpiry(String bundle, String expiry, String subject) { + public MachineConfigPoolStatusCertExpirys(String bundle, String expiry, String subject) { super(); this.bundle = bundle; this.expiry = expiry; @@ -110,12 +110,12 @@ public void setSubject(String subject) { } @JsonIgnore - public CertExpiryBuilder edit() { - return new CertExpiryBuilder(this); + public MachineConfigPoolStatusCertExpirysBuilder edit() { + return new MachineConfigPoolStatusCertExpirysBuilder(this); } @JsonIgnore - public CertExpiryBuilder toBuilder() { + public MachineConfigPoolStatusCertExpirysBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/KubeletConfigCondition.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolStatusConditions.java similarity index 82% rename from kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/KubeletConfigCondition.java rename to kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolStatusConditions.java index 6315be2ec02..c122c1a17d0 100644 --- a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/KubeletConfigCondition.java +++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigPoolStatusConditions.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.machineconfig.v1; +package io.fabric8.openshift.api.model.machineconfiguration.v1; import java.util.LinkedHashMap; import java.util.Map; @@ -55,11 +55,12 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class KubeletConfigCondition implements Editable , KubernetesResource +public class MachineConfigPoolStatusConditions implements Editable , KubernetesResource { @JsonProperty("lastTransitionTime") - private String lastTransitionTime; + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + private Object lastTransitionTime; @JsonProperty("message") private String message; @JsonProperty("reason") @@ -75,10 +76,10 @@ public class KubeletConfigCondition implements Editable , KubernetesResource { - /** - * - * (Required) - * - */ @JsonProperty("apiVersion") - private String apiVersion = "machineconfiguration.openshift.io/v1"; + private String apiVersion; @JsonProperty("fieldPath") private String fieldPath; - /** - * - * (Required) - * - */ @JsonProperty("kind") - private String kind = "MachineConfigPoolStatusConfiguration"; + private String kind; @JsonProperty("name") private String name; @JsonProperty("namespace") @@ -95,7 +77,7 @@ public class MachineConfigPoolStatusConfiguration implements Editable source = new ArrayList<>(); + private List source = new ArrayList<>(); @JsonProperty("uid") private String uid; @JsonIgnore @@ -108,7 +90,7 @@ public class MachineConfigPoolStatusConfiguration implements Editable source, String uid) { + public MachineConfigPoolStatusConfiguration(String apiVersion, String fieldPath, String kind, String name, String namespace, String resourceVersion, List source, String uid) { super(); this.apiVersion = apiVersion; this.fieldPath = fieldPath; @@ -120,21 +102,11 @@ public MachineConfigPoolStatusConfiguration(String apiVersion, String fieldPath, this.uid = uid; } - /** - * - * (Required) - * - */ @JsonProperty("apiVersion") public String getApiVersion() { return apiVersion; } - /** - * - * (Required) - * - */ @JsonProperty("apiVersion") public void setApiVersion(String apiVersion) { this.apiVersion = apiVersion; @@ -150,21 +122,11 @@ public void setFieldPath(String fieldPath) { this.fieldPath = fieldPath; } - /** - * - * (Required) - * - */ @JsonProperty("kind") public String getKind() { return kind; } - /** - * - * (Required) - * - */ @JsonProperty("kind") public void setKind(String kind) { this.kind = kind; @@ -202,12 +164,12 @@ public void setResourceVersion(String resourceVersion) { @JsonProperty("source") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getSource() { + public List getSource() { return source; } @JsonProperty("source") - public void setSource(List source) { + public void setSource(List source) { this.source = source; } diff --git a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/MachineConfigSpec.java b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigSpec.java similarity index 71% rename from kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/MachineConfigSpec.java rename to kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigSpec.java index 067d2123db4..9a290cbbb96 100644 --- a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/MachineConfigSpec.java +++ b/kubernetes-model-generator/openshift-model-machineconfiguration/src/generated/java/io/fabric8/openshift/api/model/machineconfiguration/v1/MachineConfigSpec.java @@ -1,5 +1,5 @@ -package io.fabric8.openshift.api.model.machineconfig.v1; +package io.fabric8.openshift.api.model.machineconfiguration.v1; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -63,24 +63,24 @@ public class MachineConfigSpec implements Editable , K { @JsonProperty("baseOSExtensionsContainerImage") - private java.lang.String baseOSExtensionsContainerImage; + private String baseOSExtensionsContainerImage; @JsonProperty("config") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Map config = new LinkedHashMap<>(); + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + private Object config; @JsonProperty("extensions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List extensions = new ArrayList<>(); + private List extensions = new ArrayList<>(); @JsonProperty("fips") private Boolean fips; @JsonProperty("kernelArguments") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List kernelArguments = new ArrayList<>(); + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + private Object kernelArguments; @JsonProperty("kernelType") - private java.lang.String kernelType; + private String kernelType; @JsonProperty("osImageURL") - private java.lang.String osImageURL; + private String osImageURL; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -89,7 +89,7 @@ public class MachineConfigSpec implements Editable , K public MachineConfigSpec() { } - public MachineConfigSpec(java.lang.String baseOSExtensionsContainerImage, Map config, List extensions, Boolean fips, List kernelArguments, java.lang.String kernelType, java.lang.String osImageURL) { + public MachineConfigSpec(String baseOSExtensionsContainerImage, Object config, List extensions, Boolean fips, Object kernelArguments, String kernelType, String osImageURL) { super(); this.baseOSExtensionsContainerImage = baseOSExtensionsContainerImage; this.config = config; @@ -101,34 +101,34 @@ public MachineConfigSpec(java.lang.String baseOSExtensionsContainerImage, Map getConfig() { + public Object getConfig() { return config; } @JsonProperty("config") - public void setConfig(Map config) { + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + public void setConfig(Object config) { this.config = config; } @JsonProperty("extensions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getExtensions() { + public List getExtensions() { return extensions; } @JsonProperty("extensions") - public void setExtensions(List extensions) { + public void setExtensions(List extensions) { this.extensions = extensions; } @@ -143,33 +143,33 @@ public void setFips(Boolean fips) { } @JsonProperty("kernelArguments") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getKernelArguments() { + public Object getKernelArguments() { return kernelArguments; } @JsonProperty("kernelArguments") - public void setKernelArguments(List kernelArguments) { + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + public void setKernelArguments(Object kernelArguments) { this.kernelArguments = kernelArguments; } @JsonProperty("kernelType") - public java.lang.String getKernelType() { + public String getKernelType() { return kernelType; } @JsonProperty("kernelType") - public void setKernelType(java.lang.String kernelType) { + public void setKernelType(String kernelType) { this.kernelType = kernelType; } @JsonProperty("osImageURL") - public java.lang.String getOsImageURL() { + public String getOsImageURL() { return osImageURL; } @JsonProperty("osImageURL") - public void setOsImageURL(java.lang.String osImageURL) { + public void setOsImageURL(String osImageURL) { this.osImageURL = osImageURL; } @@ -184,16 +184,16 @@ public MachineConfigSpecBuilder toBuilder() { } @JsonAnyGetter - public Map getAdditionalProperties() { + public Map getAdditionalProperties() { return this.additionalProperties; } @JsonAnySetter - public void setAdditionalProperty(java.lang.String name, java.lang.Object value) { + public void setAdditionalProperty(String name, Object value) { this.additionalProperties.put(name, value); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-machineconfig/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/openshift-model-machineconfiguration/src/main/resources/schema/kube-schema.json similarity index 100% rename from kubernetes-model-generator/openshift-model-machineconfig/src/main/resources/schema/kube-schema.json rename to kubernetes-model-generator/openshift-model-machineconfiguration/src/main/resources/schema/kube-schema.json diff --git a/kubernetes-model-generator/openshift-model-machineconfig/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/openshift-model-machineconfiguration/src/main/resources/schema/validation-schema.json similarity index 100% rename from kubernetes-model-generator/openshift-model-machineconfig/src/main/resources/schema/validation-schema.json rename to kubernetes-model-generator/openshift-model-machineconfiguration/src/main/resources/schema/validation-schema.json diff --git a/kubernetes-model-generator/pom.xml b/kubernetes-model-generator/pom.xml index 4a320142f16..11b4cc805ca 100644 --- a/kubernetes-model-generator/pom.xml +++ b/kubernetes-model-generator/pom.xml @@ -66,7 +66,7 @@ openshift-model-machine openshift-model-monitoring openshift-model-console - openshift-model-machineconfig + openshift-model-machineconfiguration openshift-model-tuned openshift-model-whereabouts openshift-model-storageversionmigrator diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ContainerRuntimeConfigTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ContainerRuntimeConfigTest.java index b2772a7db53..aa9a9374ec2 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ContainerRuntimeConfigTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ContainerRuntimeConfigTest.java @@ -15,10 +15,10 @@ */ package io.fabric8.openshift.client.server.mock; -import io.fabric8.openshift.api.model.machineconfig.v1.ContainerRuntimeConfig; -import io.fabric8.openshift.api.model.machineconfig.v1.ContainerRuntimeConfigBuilder; -import io.fabric8.openshift.api.model.machineconfig.v1.ContainerRuntimeConfigList; -import io.fabric8.openshift.api.model.machineconfig.v1.ContainerRuntimeConfigListBuilder; +import io.fabric8.openshift.api.model.machineconfiguration.v1.ContainerRuntimeConfig; +import io.fabric8.openshift.api.model.machineconfiguration.v1.ContainerRuntimeConfigBuilder; +import io.fabric8.openshift.api.model.machineconfiguration.v1.ContainerRuntimeConfigList; +import io.fabric8.openshift.api.model.machineconfiguration.v1.ContainerRuntimeConfigListBuilder; import io.fabric8.openshift.client.OpenShiftClient; import org.junit.jupiter.api.Test; diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ControllerConfigTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ControllerConfigTest.java index f2b2ba83899..8d1018b7a72 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ControllerConfigTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ControllerConfigTest.java @@ -15,11 +15,13 @@ */ package io.fabric8.openshift.client.server.mock; -import io.fabric8.openshift.api.model.config.v1.InfrastructureBuilder; -import io.fabric8.openshift.api.model.machineconfig.v1.ControllerConfig; -import io.fabric8.openshift.api.model.machineconfig.v1.ControllerConfigBuilder; -import io.fabric8.openshift.api.model.machineconfig.v1.ControllerConfigList; -import io.fabric8.openshift.api.model.machineconfig.v1.ControllerConfigListBuilder; +import io.fabric8.openshift.api.model.config.v1.InfrastructureSpecBuilder; +import io.fabric8.openshift.api.model.config.v1.InfrastructureStatusBuilder; +import io.fabric8.openshift.api.model.machineconfiguration.v1.ControllerConfig; +import io.fabric8.openshift.api.model.machineconfiguration.v1.ControllerConfigBuilder; +import io.fabric8.openshift.api.model.machineconfiguration.v1.ControllerConfigList; +import io.fabric8.openshift.api.model.machineconfiguration.v1.ControllerConfigListBuilder; +import io.fabric8.openshift.api.model.machineconfiguration.v1.ControllerConfigSpecInfraBuilder; import io.fabric8.openshift.client.OpenShiftClient; import org.junit.jupiter.api.Test; @@ -85,17 +87,17 @@ private ControllerConfig createNewControllerConfig(String name) { return new ControllerConfigBuilder() .withNewMetadata().withName(name).endMetadata() .withNewSpec() - .withInfra(new InfrastructureBuilder() - .withNewSpec() - .withNewCloudConfig() - .withName("") - .endCloudConfig() - .endSpec() - .withNewStatus() - .withNewPlatformStatus() - .withType("Libvirt") - .endPlatformStatus() - .endStatus() + .withInfra(new ControllerConfigSpecInfraBuilder() + .addToAdditionalProperties("spec", new InfrastructureSpecBuilder() + .withNewCloudConfig() + .withName("") + .endCloudConfig() + .build()) + .addToAdditionalProperties("status", new InfrastructureStatusBuilder() + .withNewPlatformStatus() + .withType("Libvirt") + .endPlatformStatus() + .build()) .build()) .withClusterDNSIP("10.2.3.10") .endSpec() diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/KubeletConfigTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/KubeletConfigTest.java index d411a1ae4d9..0d5448ff10c 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/KubeletConfigTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/KubeletConfigTest.java @@ -15,14 +15,15 @@ */ package io.fabric8.openshift.client.server.mock; -import io.fabric8.openshift.api.model.machineconfig.v1.KubeletConfig; -import io.fabric8.openshift.api.model.machineconfig.v1.KubeletConfigBuilder; -import io.fabric8.openshift.api.model.machineconfig.v1.KubeletConfigList; -import io.fabric8.openshift.api.model.machineconfig.v1.KubeletConfigListBuilder; +import io.fabric8.openshift.api.model.machineconfiguration.v1.KubeletConfig; +import io.fabric8.openshift.api.model.machineconfiguration.v1.KubeletConfigBuilder; +import io.fabric8.openshift.api.model.machineconfiguration.v1.KubeletConfigList; +import io.fabric8.openshift.api.model.machineconfiguration.v1.KubeletConfigListBuilder; import io.fabric8.openshift.client.OpenShiftClient; import org.junit.jupiter.api.Test; import java.net.HttpURLConnection; +import java.util.Collections; import static org.assertj.core.api.Assertions.assertThat; @@ -87,7 +88,7 @@ private KubeletConfig createNewKubeletConfig(String name) { .withNewMachineConfigPoolSelector() .addToMatchLabels("custom-kubelet", "large-pods") .endMachineConfigPoolSelector() - .addToKubeletConfig("maxPods", "500") + .withKubeletConfig(Collections.singletonMap("maxPods", "500")) .endSpec() .build(); } diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/MachineConfigPoolTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/MachineConfigPoolTest.java index 838b191789a..781e97714d4 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/MachineConfigPoolTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/MachineConfigPoolTest.java @@ -15,10 +15,10 @@ */ package io.fabric8.openshift.client.server.mock; -import io.fabric8.openshift.api.model.machineconfig.v1.MachineConfigPool; -import io.fabric8.openshift.api.model.machineconfig.v1.MachineConfigPoolBuilder; -import io.fabric8.openshift.api.model.machineconfig.v1.MachineConfigPoolList; -import io.fabric8.openshift.api.model.machineconfig.v1.MachineConfigPoolListBuilder; +import io.fabric8.openshift.api.model.machineconfiguration.v1.MachineConfigPool; +import io.fabric8.openshift.api.model.machineconfiguration.v1.MachineConfigPoolBuilder; +import io.fabric8.openshift.api.model.machineconfiguration.v1.MachineConfigPoolList; +import io.fabric8.openshift.api.model.machineconfiguration.v1.MachineConfigPoolListBuilder; import io.fabric8.openshift.client.OpenShiftClient; import org.junit.jupiter.api.Test; diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/MachineConfigTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/MachineConfigTest.java index 563b455089b..b28100bcd74 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/MachineConfigTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/MachineConfigTest.java @@ -15,10 +15,10 @@ */ package io.fabric8.openshift.client.server.mock; -import io.fabric8.openshift.api.model.machineconfig.v1.MachineConfig; -import io.fabric8.openshift.api.model.machineconfig.v1.MachineConfigBuilder; -import io.fabric8.openshift.api.model.machineconfig.v1.MachineConfigList; -import io.fabric8.openshift.api.model.machineconfig.v1.MachineConfigListBuilder; +import io.fabric8.openshift.api.model.machineconfiguration.v1.MachineConfig; +import io.fabric8.openshift.api.model.machineconfiguration.v1.MachineConfigBuilder; +import io.fabric8.openshift.api.model.machineconfiguration.v1.MachineConfigList; +import io.fabric8.openshift.api.model.machineconfiguration.v1.MachineConfigListBuilder; import io.fabric8.openshift.client.OpenShiftClient; import org.junit.jupiter.api.Test; diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OpenShiftResourcesTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OpenShiftResourcesTest.java index bfaf14cb2f9..2fe57a9f5b9 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OpenShiftResourcesTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OpenShiftResourcesTest.java @@ -75,11 +75,11 @@ import io.fabric8.openshift.api.model.console.v1alpha1.ConsolePlugin; import io.fabric8.openshift.api.model.machine.v1beta1.Machine; import io.fabric8.openshift.api.model.machine.v1beta1.MachineSet; -import io.fabric8.openshift.api.model.machineconfig.v1.ContainerRuntimeConfig; -import io.fabric8.openshift.api.model.machineconfig.v1.ControllerConfig; -import io.fabric8.openshift.api.model.machineconfig.v1.KubeletConfig; -import io.fabric8.openshift.api.model.machineconfig.v1.MachineConfig; -import io.fabric8.openshift.api.model.machineconfig.v1.MachineConfigPool; +import io.fabric8.openshift.api.model.machineconfiguration.v1.ContainerRuntimeConfig; +import io.fabric8.openshift.api.model.machineconfiguration.v1.ControllerConfig; +import io.fabric8.openshift.api.model.machineconfiguration.v1.KubeletConfig; +import io.fabric8.openshift.api.model.machineconfiguration.v1.MachineConfig; +import io.fabric8.openshift.api.model.machineconfiguration.v1.MachineConfigPool; import io.fabric8.openshift.api.model.miscellaneous.apiserver.v1.APIRequestCount; import io.fabric8.openshift.api.model.miscellaneous.cloudcredential.v1.CredentialsRequest; import io.fabric8.openshift.api.model.miscellaneous.helm.v1beta1.HelmChartRepository; diff --git a/openshift-client-api/pom.xml b/openshift-client-api/pom.xml index a9032d98c8f..22f384e111e 100644 --- a/openshift-client-api/pom.xml +++ b/openshift-client-api/pom.xml @@ -97,7 +97,7 @@ io.fabric8 - openshift-model-machineconfig + openshift-model-machineconfiguration io.fabric8 diff --git a/openshift-client-api/src/main/java/io/fabric8/openshift/client/dsl/MachineConfigurationAPIGroupDSL.java b/openshift-client-api/src/main/java/io/fabric8/openshift/client/dsl/MachineConfigurationAPIGroupDSL.java index bc7f8b71efc..f892dd801d6 100644 --- a/openshift-client-api/src/main/java/io/fabric8/openshift/client/dsl/MachineConfigurationAPIGroupDSL.java +++ b/openshift-client-api/src/main/java/io/fabric8/openshift/client/dsl/MachineConfigurationAPIGroupDSL.java @@ -18,16 +18,16 @@ import io.fabric8.kubernetes.client.Client; import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation; import io.fabric8.kubernetes.client.dsl.Resource; -import io.fabric8.openshift.api.model.machineconfig.v1.ContainerRuntimeConfig; -import io.fabric8.openshift.api.model.machineconfig.v1.ContainerRuntimeConfigList; -import io.fabric8.openshift.api.model.machineconfig.v1.ControllerConfig; -import io.fabric8.openshift.api.model.machineconfig.v1.ControllerConfigList; -import io.fabric8.openshift.api.model.machineconfig.v1.KubeletConfig; -import io.fabric8.openshift.api.model.machineconfig.v1.KubeletConfigList; -import io.fabric8.openshift.api.model.machineconfig.v1.MachineConfig; -import io.fabric8.openshift.api.model.machineconfig.v1.MachineConfigList; -import io.fabric8.openshift.api.model.machineconfig.v1.MachineConfigPool; -import io.fabric8.openshift.api.model.machineconfig.v1.MachineConfigPoolList; +import io.fabric8.openshift.api.model.machineconfiguration.v1.ContainerRuntimeConfig; +import io.fabric8.openshift.api.model.machineconfiguration.v1.ContainerRuntimeConfigList; +import io.fabric8.openshift.api.model.machineconfiguration.v1.ControllerConfig; +import io.fabric8.openshift.api.model.machineconfiguration.v1.ControllerConfigList; +import io.fabric8.openshift.api.model.machineconfiguration.v1.KubeletConfig; +import io.fabric8.openshift.api.model.machineconfiguration.v1.KubeletConfigList; +import io.fabric8.openshift.api.model.machineconfiguration.v1.MachineConfig; +import io.fabric8.openshift.api.model.machineconfiguration.v1.MachineConfigList; +import io.fabric8.openshift.api.model.machineconfiguration.v1.MachineConfigPool; +import io.fabric8.openshift.api.model.machineconfiguration.v1.MachineConfigPoolList; public interface MachineConfigurationAPIGroupDSL extends Client { /** diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/impl/OpenShiftMachineConfigurationAPIGroupClient.java b/openshift-client/src/main/java/io/fabric8/openshift/client/impl/OpenShiftMachineConfigurationAPIGroupClient.java index c7db8b0d095..28188c73448 100644 --- a/openshift-client/src/main/java/io/fabric8/openshift/client/impl/OpenShiftMachineConfigurationAPIGroupClient.java +++ b/openshift-client/src/main/java/io/fabric8/openshift/client/impl/OpenShiftMachineConfigurationAPIGroupClient.java @@ -18,16 +18,16 @@ import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation; import io.fabric8.kubernetes.client.dsl.Resource; import io.fabric8.kubernetes.client.extension.ClientAdapter; -import io.fabric8.openshift.api.model.machineconfig.v1.ContainerRuntimeConfig; -import io.fabric8.openshift.api.model.machineconfig.v1.ContainerRuntimeConfigList; -import io.fabric8.openshift.api.model.machineconfig.v1.ControllerConfig; -import io.fabric8.openshift.api.model.machineconfig.v1.ControllerConfigList; -import io.fabric8.openshift.api.model.machineconfig.v1.KubeletConfig; -import io.fabric8.openshift.api.model.machineconfig.v1.KubeletConfigList; -import io.fabric8.openshift.api.model.machineconfig.v1.MachineConfig; -import io.fabric8.openshift.api.model.machineconfig.v1.MachineConfigList; -import io.fabric8.openshift.api.model.machineconfig.v1.MachineConfigPool; -import io.fabric8.openshift.api.model.machineconfig.v1.MachineConfigPoolList; +import io.fabric8.openshift.api.model.machineconfiguration.v1.ContainerRuntimeConfig; +import io.fabric8.openshift.api.model.machineconfiguration.v1.ContainerRuntimeConfigList; +import io.fabric8.openshift.api.model.machineconfiguration.v1.ControllerConfig; +import io.fabric8.openshift.api.model.machineconfiguration.v1.ControllerConfigList; +import io.fabric8.openshift.api.model.machineconfiguration.v1.KubeletConfig; +import io.fabric8.openshift.api.model.machineconfiguration.v1.KubeletConfigList; +import io.fabric8.openshift.api.model.machineconfiguration.v1.MachineConfig; +import io.fabric8.openshift.api.model.machineconfiguration.v1.MachineConfigList; +import io.fabric8.openshift.api.model.machineconfiguration.v1.MachineConfigPool; +import io.fabric8.openshift.api.model.machineconfiguration.v1.MachineConfigPoolList; import io.fabric8.openshift.client.dsl.MachineConfigurationAPIGroupDSL; public class OpenShiftMachineConfigurationAPIGroupClient extends ClientAdapter diff --git a/platforms/karaf/features/src/main/resources/feature.xml b/platforms/karaf/features/src/main/resources/feature.xml index 00b0d23a431..a92c3c8875d 100644 --- a/platforms/karaf/features/src/main/resources/feature.xml +++ b/platforms/karaf/features/src/main/resources/feature.xml @@ -78,7 +78,7 @@ mvn:io.fabric8/openshift-model-monitoring/${project.version} mvn:io.fabric8/openshift-model-operator/${project.version} mvn:io.fabric8/openshift-model-operatorhub/${project.version} - mvn:io.fabric8/openshift-model-machineconfig/${project.version} + mvn:io.fabric8/openshift-model-machineconfiguration/${project.version} mvn:io.fabric8/openshift-model-miscellaneous/${project.version} mvn:io.fabric8/openshift-model-whereabouts/${project.version} mvn:io.fabric8/openshift-model-storageversionmigrator/${project.version} diff --git a/pom.xml b/pom.xml index 6b8179445c6..e01bca7c638 100644 --- a/pom.xml +++ b/pom.xml @@ -422,7 +422,7 @@ io.fabric8 - openshift-model-machineconfig + openshift-model-machineconfiguration ${project.version} diff --git a/uberjar/pom.xml b/uberjar/pom.xml index a7110675ff2..ae1a515a0b5 100644 --- a/uberjar/pom.xml +++ b/uberjar/pom.xml @@ -160,7 +160,7 @@ io.fabric8 - openshift-model-machineconfig + openshift-model-machineconfiguration io.fabric8 @@ -286,12 +286,12 @@ io.fabric8:kubernetes-model-storageclass io.fabric8:kubernetes-model-resource io.fabric8:openshift-model - io.fabric8:openshift-model-clusterautoscaling + io.fabric8:openshift-model-autoscaling io.fabric8:openshift-model-console io.fabric8:openshift-model-config io.fabric8:openshift-model-operator io.fabric8:openshift-model-operatorhub - io.fabric8:openshift-model-machineconfig + io.fabric8:openshift-model-machineconfiguration io.fabric8:openshift-model-machine io.fabric8:openshift-model-miscellaneous io.fabric8:openshift-model-monitoring @@ -347,12 +347,12 @@ io.fabric8:kubernetes-model-storageclass io.fabric8:kubernetes-model-resource io.fabric8:openshift-model - io.fabric8:openshift-model-clusterautoscaling + io.fabric8:openshift-model-autoscaling io.fabric8:openshift-model-console io.fabric8:openshift-model-config io.fabric8:openshift-model-operator io.fabric8:openshift-model-operatorhub - io.fabric8:openshift-model-machineconfig + io.fabric8:openshift-model-machineconfiguration io.fabric8:openshift-model-miscellaneous io.fabric8:openshift-model-machine io.fabric8:openshift-model-monitoring