diff --git a/kubernetes-model-generator/openapi/generator/pkg/openapi/openapi-gen.go b/kubernetes-model-generator/openapi/generator/pkg/openapi/openapi-gen.go
index c15c737d39a..ee12d10da6b 100644
--- a/kubernetes-model-generator/openapi/generator/pkg/openapi/openapi-gen.go
+++ b/kubernetes-model-generator/openapi/generator/pkg/openapi/openapi-gen.go
@@ -44,6 +44,9 @@ func (g *GoGenerator) Generate() error {
 	)
 }
 
+// KubernetesTargets wrapper function around kube-openapi's generators.GetTargets function.
+//
+// Allows to override the default kube-openapi generators.apiTypeFilterFunc with our own (see KubernetesFilterFunc).
 func (g *GoGenerator) KubernetesTargets(context *generator.Context) []generator.Target {
 	// Create a map of all the input packages for performance (queried later on)
 	g.inputPkgs = make(map[string]bool)
@@ -59,8 +62,16 @@ func (g *GoGenerator) KubernetesTargets(context *generator.Context) []generator.
 	return openApiGenTargets
 }
 
-// KubernetesFilterFunc
+// KubernetesFilterFunc function to filter out types that are not Kubernetes Objects,
+// Lists, or nested structs within those.
+//
 // Adaptation of https://github.com/kubernetes/kube-openapi/blob/9e1beecbcb384a484fb5cbd41024f316d51fdfac/pkg/generators/openapi.go#L106
+//
+// The original function only takes into account those structs that have been tagged with +k8s:openapi-gen=true
+// or that belong to a package that has been tagged with +k8s:openapi-gen=true
+//
+// The default behavior is fine for most packages, however, some of them lack these annotations.
+// While the upstream projects are fixed, we need to provide a workaround to generate the complete OpenAPI definitions.
 func (g *GoGenerator) KubernetesFilterFunc(c *generator.Context, t *types.Type) bool {
 	// Skip types that are not structs
 	if t.Kind != types.Struct {
diff --git a/kubernetes-model-generator/openapi/generator/pkg/openshift/openshift.go b/kubernetes-model-generator/openapi/generator/pkg/openshift/openshift.go
index 9cc7bb95628..c78c706b7fc 100644
--- a/kubernetes-model-generator/openapi/generator/pkg/openshift/openshift.go
+++ b/kubernetes-model-generator/openapi/generator/pkg/openshift/openshift.go
@@ -19,11 +19,12 @@ package openshift
 
 // PackagePatterns are the patterns required for OpenShift GO and JSON OpenAPI generation
 var PackagePatterns = []string{
+	// Always import Kubernetes base packages as they are required by the rest of APIs
+	"k8s.io/apimachinery/pkg/apis/meta/v...",
+	"k8s.io/api/.../v...",
+	// OpenShift APIs
 	"github.com/openshift/api/.../v...",
 	// CRDs don't provide info for reused types
 	"github.com/operator-framework/api/pkg/operators/v...",
 	"github.com/openshift/cluster-network-operator/pkg/apis/.../v...",
-	// Always import Kubernetes base packages as they are required by the rest of APIs
-	"k8s.io/apimachinery/pkg/apis/meta/v...",
-	"k8s.io/api/.../v...",
 }
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/pom.xml b/kubernetes-model-generator/openshift-model-operatorhub/pom.xml
index bbb833787f8..cdddf9494e7 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/pom.xml
+++ b/kubernetes-model-generator/openshift-model-operatorhub/pom.xml
@@ -43,6 +43,18 @@
       <groupId>io.fabric8</groupId>
       <artifactId>kubernetes-model-core</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.fabric8</groupId>
+      <artifactId>kubernetes-model-admissionregistration</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.fabric8</groupId>
+      <artifactId>kubernetes-model-apps</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.fabric8</groupId>
+      <artifactId>kubernetes-model-rbac</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
@@ -58,22 +70,16 @@
           <plugin>
             <groupId>io.fabric8</groupId>
             <artifactId>openapi-model-generator-maven-plugin</artifactId>
-            <configuration >
+            <configuration>
               <settings combine.self="append">
                 <schemas>
-                  <schema>${openapi.schema.openshift-latest}</schema>
+                  <schema>${openapi.schema.openshift-generated}</schema>
                 </schemas>
                 <packageMappings combine.self="append">
-                  <io.k8s.api>io.fabric8.kubernetes.api.model</io.k8s.api>
-                  <io.openshift.operatorhub>io.fabric8.openshift.api.model.operatorhub</io.openshift.operatorhub>
                   <com.coreos.operators>io.fabric8.openshift.api.model.operatorhub</com.coreos.operators>
-                  <com.github.operator-framework.api.pkg.operators>io.fabric8.openshift.api.model.operatorhub</com.github.operator-framework.api.pkg.operators>
-                  <com.github.operator-framework.operator-lifecycle-manager.pkg.package-server.apis.operators>io.fabric8.openshift.api.model.operatorhub.lifecyclemanager</com.github.operator-framework.operator-lifecycle-manager.pkg.package-server.apis.operators>
                 </packageMappings>
                 <includeGenerationRegexes>
                   <includeGenerationRegex>^com\.coreos\.operators\..*$</includeGenerationRegex>
-                  <includeGenerationRegex>^com\.github\.operator-framework\.api\.pkg\.operators\.v1alpha1\..*$</includeGenerationRegex>
-                  <includeGenerationRegex>^com\.github\.operator-framework\.operator-lifecycle-manager\.pkg\.package-server\.apis\.operators\..*$</includeGenerationRegex>
                 </includeGenerationRegexes>
               </settings>
             </configuration>
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/lifecyclemanager/v1/CSVDescription.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/lifecyclemanager/v1/CSVDescription.java
deleted file mode 100644
index 0b1b7a74047..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/lifecyclemanager/v1/CSVDescription.java
+++ /dev/null
@@ -1,340 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.lifecyclemanager.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.GroupVersionKind;
-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.operatorhub.v1alpha1.APIServiceDefinitions;
-import io.fabric8.openshift.api.model.operatorhub.v1alpha1.CustomResourceDefinitions;
-import io.fabric8.openshift.api.model.operatorhub.v1alpha1.InstallMode;
-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({
-    "annotations",
-    "apiservicedefinitions",
-    "customresourcedefinitions",
-    "description",
-    "displayName",
-    "icon",
-    "installModes",
-    "keywords",
-    "links",
-    "maintainers",
-    "maturity",
-    "minKubeVersion",
-    "nativeApis",
-    "provider",
-    "relatedImages",
-    "version"
-})
-@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 CSVDescription implements Editable<CSVDescriptionBuilder> , KubernetesResource
-{
-
-    @JsonProperty("annotations")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, String> annotations = new LinkedHashMap<>();
-    @JsonProperty("apiservicedefinitions")
-    private APIServiceDefinitions apiservicedefinitions;
-    @JsonProperty("customresourcedefinitions")
-    private CustomResourceDefinitions customresourcedefinitions;
-    @JsonProperty("description")
-    private String description;
-    @JsonProperty("displayName")
-    private String displayName;
-    @JsonProperty("icon")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<Icon> icon = new ArrayList<>();
-    @JsonProperty("installModes")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<InstallMode> installModes = new ArrayList<>();
-    @JsonProperty("keywords")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> keywords = new ArrayList<>();
-    @JsonProperty("links")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<AppLink> links = new ArrayList<>();
-    @JsonProperty("maintainers")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<Maintainer> maintainers = new ArrayList<>();
-    @JsonProperty("maturity")
-    private String maturity;
-    @JsonProperty("minKubeVersion")
-    private String minKubeVersion;
-    @JsonProperty("nativeApis")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<GroupVersionKind> nativeApis = new ArrayList<>();
-    @JsonProperty("provider")
-    private AppLink provider;
-    @JsonProperty("relatedImages")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> relatedImages = new ArrayList<>();
-    @JsonProperty("version")
-    private String version;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public CSVDescription() {
-    }
-
-    public CSVDescription(Map<String, String> annotations, APIServiceDefinitions apiservicedefinitions, CustomResourceDefinitions customresourcedefinitions, String description, String displayName, List<Icon> icon, List<InstallMode> installModes, List<String> keywords, List<AppLink> links, List<Maintainer> maintainers, String maturity, String minKubeVersion, List<GroupVersionKind> nativeApis, AppLink provider, List<String> relatedImages, String version) {
-        super();
-        this.annotations = annotations;
-        this.apiservicedefinitions = apiservicedefinitions;
-        this.customresourcedefinitions = customresourcedefinitions;
-        this.description = description;
-        this.displayName = displayName;
-        this.icon = icon;
-        this.installModes = installModes;
-        this.keywords = keywords;
-        this.links = links;
-        this.maintainers = maintainers;
-        this.maturity = maturity;
-        this.minKubeVersion = minKubeVersion;
-        this.nativeApis = nativeApis;
-        this.provider = provider;
-        this.relatedImages = relatedImages;
-        this.version = version;
-    }
-
-    @JsonProperty("annotations")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, String> getAnnotations() {
-        return annotations;
-    }
-
-    @JsonProperty("annotations")
-    public void setAnnotations(Map<String, String> annotations) {
-        this.annotations = annotations;
-    }
-
-    @JsonProperty("apiservicedefinitions")
-    public APIServiceDefinitions getApiservicedefinitions() {
-        return apiservicedefinitions;
-    }
-
-    @JsonProperty("apiservicedefinitions")
-    public void setApiservicedefinitions(APIServiceDefinitions apiservicedefinitions) {
-        this.apiservicedefinitions = apiservicedefinitions;
-    }
-
-    @JsonProperty("customresourcedefinitions")
-    public CustomResourceDefinitions getCustomresourcedefinitions() {
-        return customresourcedefinitions;
-    }
-
-    @JsonProperty("customresourcedefinitions")
-    public void setCustomresourcedefinitions(CustomResourceDefinitions customresourcedefinitions) {
-        this.customresourcedefinitions = customresourcedefinitions;
-    }
-
-    @JsonProperty("description")
-    public String getDescription() {
-        return description;
-    }
-
-    @JsonProperty("description")
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    @JsonProperty("displayName")
-    public String getDisplayName() {
-        return displayName;
-    }
-
-    @JsonProperty("displayName")
-    public void setDisplayName(String displayName) {
-        this.displayName = displayName;
-    }
-
-    @JsonProperty("icon")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<Icon> getIcon() {
-        return icon;
-    }
-
-    @JsonProperty("icon")
-    public void setIcon(List<Icon> icon) {
-        this.icon = icon;
-    }
-
-    @JsonProperty("installModes")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<InstallMode> getInstallModes() {
-        return installModes;
-    }
-
-    @JsonProperty("installModes")
-    public void setInstallModes(List<InstallMode> installModes) {
-        this.installModes = installModes;
-    }
-
-    @JsonProperty("keywords")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getKeywords() {
-        return keywords;
-    }
-
-    @JsonProperty("keywords")
-    public void setKeywords(List<String> keywords) {
-        this.keywords = keywords;
-    }
-
-    @JsonProperty("links")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<AppLink> getLinks() {
-        return links;
-    }
-
-    @JsonProperty("links")
-    public void setLinks(List<AppLink> links) {
-        this.links = links;
-    }
-
-    @JsonProperty("maintainers")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<Maintainer> getMaintainers() {
-        return maintainers;
-    }
-
-    @JsonProperty("maintainers")
-    public void setMaintainers(List<Maintainer> maintainers) {
-        this.maintainers = maintainers;
-    }
-
-    @JsonProperty("maturity")
-    public String getMaturity() {
-        return maturity;
-    }
-
-    @JsonProperty("maturity")
-    public void setMaturity(String maturity) {
-        this.maturity = maturity;
-    }
-
-    @JsonProperty("minKubeVersion")
-    public String getMinKubeVersion() {
-        return minKubeVersion;
-    }
-
-    @JsonProperty("minKubeVersion")
-    public void setMinKubeVersion(String minKubeVersion) {
-        this.minKubeVersion = minKubeVersion;
-    }
-
-    @JsonProperty("nativeApis")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<GroupVersionKind> getNativeApis() {
-        return nativeApis;
-    }
-
-    @JsonProperty("nativeApis")
-    public void setNativeApis(List<GroupVersionKind> nativeApis) {
-        this.nativeApis = nativeApis;
-    }
-
-    @JsonProperty("provider")
-    public AppLink getProvider() {
-        return provider;
-    }
-
-    @JsonProperty("provider")
-    public void setProvider(AppLink provider) {
-        this.provider = provider;
-    }
-
-    @JsonProperty("relatedImages")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getRelatedImages() {
-        return relatedImages;
-    }
-
-    @JsonProperty("relatedImages")
-    public void setRelatedImages(List<String> relatedImages) {
-        this.relatedImages = relatedImages;
-    }
-
-    @JsonProperty("version")
-    public String getVersion() {
-        return version;
-    }
-
-    @JsonProperty("version")
-    public void setVersion(String version) {
-        this.version = version;
-    }
-
-    @JsonIgnore
-    public CSVDescriptionBuilder edit() {
-        return new CSVDescriptionBuilder(this);
-    }
-
-    @JsonIgnore
-    public CSVDescriptionBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/lifecyclemanager/v1/ChannelEntry.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/lifecyclemanager/v1/ChannelEntry.java
deleted file mode 100644
index 3fd369f0767..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/lifecyclemanager/v1/ChannelEntry.java
+++ /dev/null
@@ -1,136 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.lifecyclemanager.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({
-    "deprecation",
-    "name",
-    "version"
-})
-@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 ChannelEntry implements Editable<ChannelEntryBuilder> , KubernetesResource
-{
-
-    @JsonProperty("deprecation")
-    private Deprecation deprecation;
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("version")
-    private String version;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ChannelEntry() {
-    }
-
-    public ChannelEntry(Deprecation deprecation, String name, String version) {
-        super();
-        this.deprecation = deprecation;
-        this.name = name;
-        this.version = version;
-    }
-
-    @JsonProperty("deprecation")
-    public Deprecation getDeprecation() {
-        return deprecation;
-    }
-
-    @JsonProperty("deprecation")
-    public void setDeprecation(Deprecation deprecation) {
-        this.deprecation = deprecation;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("version")
-    public String getVersion() {
-        return version;
-    }
-
-    @JsonProperty("version")
-    public void setVersion(String version) {
-        this.version = version;
-    }
-
-    @JsonIgnore
-    public ChannelEntryBuilder edit() {
-        return new ChannelEntryBuilder(this);
-    }
-
-    @JsonIgnore
-    public ChannelEntryBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/lifecyclemanager/v1/Deprecation.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/lifecyclemanager/v1/Deprecation.java
deleted file mode 100644
index ad00284d437..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/lifecyclemanager/v1/Deprecation.java
+++ /dev/null
@@ -1,108 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.lifecyclemanager.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({
-    "message"
-})
-@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 Deprecation implements Editable<DeprecationBuilder> , KubernetesResource
-{
-
-    @JsonProperty("message")
-    private String message;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public Deprecation() {
-    }
-
-    public Deprecation(String message) {
-        super();
-        this.message = message;
-    }
-
-    @JsonProperty("message")
-    public String getMessage() {
-        return message;
-    }
-
-    @JsonProperty("message")
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    @JsonIgnore
-    public DeprecationBuilder edit() {
-        return new DeprecationBuilder(this);
-    }
-
-    @JsonIgnore
-    public DeprecationBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/lifecyclemanager/v1/PackageChannel.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/lifecyclemanager/v1/PackageChannel.java
deleted file mode 100644
index fe01c7afc7e..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/lifecyclemanager/v1/PackageChannel.java
+++ /dev/null
@@ -1,168 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.lifecyclemanager.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({
-    "currentCSV",
-    "currentCSVDesc",
-    "deprecation",
-    "entries",
-    "name"
-})
-@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 PackageChannel implements Editable<PackageChannelBuilder> , KubernetesResource
-{
-
-    @JsonProperty("currentCSV")
-    private String currentCSV;
-    @JsonProperty("currentCSVDesc")
-    private CSVDescription currentCSVDesc;
-    @JsonProperty("deprecation")
-    private Deprecation deprecation;
-    @JsonProperty("entries")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ChannelEntry> entries = new ArrayList<>();
-    @JsonProperty("name")
-    private String name;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public PackageChannel() {
-    }
-
-    public PackageChannel(String currentCSV, CSVDescription currentCSVDesc, Deprecation deprecation, List<ChannelEntry> entries, String name) {
-        super();
-        this.currentCSV = currentCSV;
-        this.currentCSVDesc = currentCSVDesc;
-        this.deprecation = deprecation;
-        this.entries = entries;
-        this.name = name;
-    }
-
-    @JsonProperty("currentCSV")
-    public String getCurrentCSV() {
-        return currentCSV;
-    }
-
-    @JsonProperty("currentCSV")
-    public void setCurrentCSV(String currentCSV) {
-        this.currentCSV = currentCSV;
-    }
-
-    @JsonProperty("currentCSVDesc")
-    public CSVDescription getCurrentCSVDesc() {
-        return currentCSVDesc;
-    }
-
-    @JsonProperty("currentCSVDesc")
-    public void setCurrentCSVDesc(CSVDescription currentCSVDesc) {
-        this.currentCSVDesc = currentCSVDesc;
-    }
-
-    @JsonProperty("deprecation")
-    public Deprecation getDeprecation() {
-        return deprecation;
-    }
-
-    @JsonProperty("deprecation")
-    public void setDeprecation(Deprecation deprecation) {
-        this.deprecation = deprecation;
-    }
-
-    @JsonProperty("entries")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ChannelEntry> getEntries() {
-        return entries;
-    }
-
-    @JsonProperty("entries")
-    public void setEntries(List<ChannelEntry> entries) {
-        this.entries = entries;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonIgnore
-    public PackageChannelBuilder edit() {
-        return new PackageChannelBuilder(this);
-    }
-
-    @JsonIgnore
-    public PackageChannelBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/lifecyclemanager/v1/PackageManifest.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/lifecyclemanager/v1/PackageManifest.java
deleted file mode 100644
index dd63e47ec20..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/lifecyclemanager/v1/PackageManifest.java
+++ /dev/null
@@ -1,204 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.lifecyclemanager.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.HasMetadata;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.Namespaced;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.fabric8.kubernetes.model.annotation.Group;
-import io.fabric8.kubernetes.model.annotation.Version;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import io.sundr.transform.annotations.TemplateTransformation;
-import io.sundr.transform.annotations.TemplateTransformations;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "apiVersion",
-    "kind",
-    "metadata",
-    "spec",
-    "status"
-})
-@ToString
-@EqualsAndHashCode
-@Accessors(prefix = {
-    "_",
-    ""
-})
-@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
-    @BuildableReference(ObjectMeta.class),
-    @BuildableReference(LabelSelector.class),
-    @BuildableReference(Container.class),
-    @BuildableReference(PodTemplateSpec.class),
-    @BuildableReference(ResourceRequirements.class),
-    @BuildableReference(IntOrString.class),
-    @BuildableReference(ObjectReference.class),
-    @BuildableReference(LocalObjectReference.class),
-    @BuildableReference(PersistentVolumeClaim.class)
-})
-@TemplateTransformations({
-    @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true)
-})
-@Version("v1")
-@Group("packages.operators.coreos.com")
-@Generated("jsonschema2pojo")
-public class PackageManifest implements Editable<PackageManifestBuilder> , HasMetadata, Namespaced
-{
-
-    /**
-     * 
-     * (Required)
-     * 
-     */
-    @JsonProperty("apiVersion")
-    private String apiVersion = "packages.operators.coreos.com/v1";
-    /**
-     * 
-     * (Required)
-     * 
-     */
-    @JsonProperty("kind")
-    private String kind = "PackageManifest";
-    @JsonProperty("metadata")
-    private ObjectMeta metadata;
-    @JsonProperty("spec")
-    private PackageManifestSpec spec;
-    @JsonProperty("status")
-    private PackageManifestStatus status;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public PackageManifest() {
-    }
-
-    public PackageManifest(String apiVersion, String kind, ObjectMeta metadata, PackageManifestSpec spec, PackageManifestStatus status) {
-        super();
-        this.apiVersion = apiVersion;
-        this.kind = kind;
-        this.metadata = metadata;
-        this.spec = spec;
-        this.status = status;
-    }
-
-    /**
-     * 
-     * (Required)
-     * 
-     */
-    @JsonProperty("apiVersion")
-    public String getApiVersion() {
-        return apiVersion;
-    }
-
-    /**
-     * 
-     * (Required)
-     * 
-     */
-    @JsonProperty("apiVersion")
-    public void setApiVersion(String apiVersion) {
-        this.apiVersion = apiVersion;
-    }
-
-    /**
-     * 
-     * (Required)
-     * 
-     */
-    @JsonProperty("kind")
-    public String getKind() {
-        return kind;
-    }
-
-    /**
-     * 
-     * (Required)
-     * 
-     */
-    @JsonProperty("kind")
-    public void setKind(String kind) {
-        this.kind = kind;
-    }
-
-    @JsonProperty("metadata")
-    public ObjectMeta getMetadata() {
-        return metadata;
-    }
-
-    @JsonProperty("metadata")
-    public void setMetadata(ObjectMeta metadata) {
-        this.metadata = metadata;
-    }
-
-    @JsonProperty("spec")
-    public PackageManifestSpec getSpec() {
-        return spec;
-    }
-
-    @JsonProperty("spec")
-    public void setSpec(PackageManifestSpec spec) {
-        this.spec = spec;
-    }
-
-    @JsonProperty("status")
-    public PackageManifestStatus getStatus() {
-        return status;
-    }
-
-    @JsonProperty("status")
-    public void setStatus(PackageManifestStatus status) {
-        this.status = status;
-    }
-
-    @JsonIgnore
-    public PackageManifestBuilder edit() {
-        return new PackageManifestBuilder(this);
-    }
-
-    @JsonIgnore
-    public PackageManifestBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/lifecyclemanager/v1/PackageManifestList.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/lifecyclemanager/v1/PackageManifestList.java
deleted file mode 100644
index fb692cddb08..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/lifecyclemanager/v1/PackageManifestList.java
+++ /dev/null
@@ -1,195 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.lifecyclemanager.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.KubernetesResourceList;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.ListMeta;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.fabric8.kubernetes.model.annotation.Group;
-import io.fabric8.kubernetes.model.annotation.Version;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import io.sundr.transform.annotations.TemplateTransformation;
-import io.sundr.transform.annotations.TemplateTransformations;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "apiVersion",
-    "kind",
-    "metadata",
-    "items"
-})
-@ToString
-@EqualsAndHashCode
-@Accessors(prefix = {
-    "_",
-    ""
-})
-@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
-    @BuildableReference(ObjectMeta.class),
-    @BuildableReference(LabelSelector.class),
-    @BuildableReference(Container.class),
-    @BuildableReference(PodTemplateSpec.class),
-    @BuildableReference(ResourceRequirements.class),
-    @BuildableReference(IntOrString.class),
-    @BuildableReference(ObjectReference.class),
-    @BuildableReference(LocalObjectReference.class),
-    @BuildableReference(PersistentVolumeClaim.class)
-})
-@TemplateTransformations({
-    @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true)
-})
-@Version("v1")
-@Group("packages.operators.coreos.com")
-@Generated("jsonschema2pojo")
-public class PackageManifestList implements Editable<PackageManifestListBuilder> , KubernetesResource, KubernetesResourceList<io.fabric8.openshift.api.model.operatorhub.lifecyclemanager.v1.PackageManifest>
-{
-
-    /**
-     * 
-     * (Required)
-     * 
-     */
-    @JsonProperty("apiVersion")
-    private String apiVersion = "packages.operators.coreos.com/v1";
-    @JsonProperty("items")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<io.fabric8.openshift.api.model.operatorhub.lifecyclemanager.v1.PackageManifest> items = new ArrayList<>();
-    /**
-     * 
-     * (Required)
-     * 
-     */
-    @JsonProperty("kind")
-    private String kind = "PackageManifestList";
-    @JsonProperty("metadata")
-    private ListMeta metadata;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public PackageManifestList() {
-    }
-
-    public PackageManifestList(String apiVersion, List<io.fabric8.openshift.api.model.operatorhub.lifecyclemanager.v1.PackageManifest> items, String kind, ListMeta metadata) {
-        super();
-        this.apiVersion = apiVersion;
-        this.items = items;
-        this.kind = kind;
-        this.metadata = metadata;
-    }
-
-    /**
-     * 
-     * (Required)
-     * 
-     */
-    @JsonProperty("apiVersion")
-    public String getApiVersion() {
-        return apiVersion;
-    }
-
-    /**
-     * 
-     * (Required)
-     * 
-     */
-    @JsonProperty("apiVersion")
-    public void setApiVersion(String apiVersion) {
-        this.apiVersion = apiVersion;
-    }
-
-    @JsonProperty("items")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<io.fabric8.openshift.api.model.operatorhub.lifecyclemanager.v1.PackageManifest> getItems() {
-        return items;
-    }
-
-    @JsonProperty("items")
-    public void setItems(List<io.fabric8.openshift.api.model.operatorhub.lifecyclemanager.v1.PackageManifest> items) {
-        this.items = items;
-    }
-
-    /**
-     * 
-     * (Required)
-     * 
-     */
-    @JsonProperty("kind")
-    public String getKind() {
-        return kind;
-    }
-
-    /**
-     * 
-     * (Required)
-     * 
-     */
-    @JsonProperty("kind")
-    public void setKind(String kind) {
-        this.kind = kind;
-    }
-
-    @JsonProperty("metadata")
-    public ListMeta getMetadata() {
-        return metadata;
-    }
-
-    @JsonProperty("metadata")
-    public void setMetadata(ListMeta metadata) {
-        this.metadata = metadata;
-    }
-
-    @JsonIgnore
-    public PackageManifestListBuilder edit() {
-        return new PackageManifestListBuilder(this);
-    }
-
-    @JsonIgnore
-    public PackageManifestListBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/lifecyclemanager/v1/PackageManifestStatus.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/lifecyclemanager/v1/PackageManifestStatus.java
deleted file mode 100644
index c21e1350007..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/lifecyclemanager/v1/PackageManifestStatus.java
+++ /dev/null
@@ -1,224 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.lifecyclemanager.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({
-    "catalogSource",
-    "catalogSourceDisplayName",
-    "catalogSourceNamespace",
-    "catalogSourcePublisher",
-    "channels",
-    "defaultChannel",
-    "deprecation",
-    "packageName",
-    "provider"
-})
-@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 PackageManifestStatus implements Editable<PackageManifestStatusBuilder> , KubernetesResource
-{
-
-    @JsonProperty("catalogSource")
-    private String catalogSource;
-    @JsonProperty("catalogSourceDisplayName")
-    private String catalogSourceDisplayName;
-    @JsonProperty("catalogSourceNamespace")
-    private String catalogSourceNamespace;
-    @JsonProperty("catalogSourcePublisher")
-    private String catalogSourcePublisher;
-    @JsonProperty("channels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<PackageChannel> channels = new ArrayList<>();
-    @JsonProperty("defaultChannel")
-    private String defaultChannel;
-    @JsonProperty("deprecation")
-    private Deprecation deprecation;
-    @JsonProperty("packageName")
-    private String packageName;
-    @JsonProperty("provider")
-    private AppLink provider;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public PackageManifestStatus() {
-    }
-
-    public PackageManifestStatus(String catalogSource, String catalogSourceDisplayName, String catalogSourceNamespace, String catalogSourcePublisher, List<PackageChannel> channels, String defaultChannel, Deprecation deprecation, String packageName, AppLink provider) {
-        super();
-        this.catalogSource = catalogSource;
-        this.catalogSourceDisplayName = catalogSourceDisplayName;
-        this.catalogSourceNamespace = catalogSourceNamespace;
-        this.catalogSourcePublisher = catalogSourcePublisher;
-        this.channels = channels;
-        this.defaultChannel = defaultChannel;
-        this.deprecation = deprecation;
-        this.packageName = packageName;
-        this.provider = provider;
-    }
-
-    @JsonProperty("catalogSource")
-    public String getCatalogSource() {
-        return catalogSource;
-    }
-
-    @JsonProperty("catalogSource")
-    public void setCatalogSource(String catalogSource) {
-        this.catalogSource = catalogSource;
-    }
-
-    @JsonProperty("catalogSourceDisplayName")
-    public String getCatalogSourceDisplayName() {
-        return catalogSourceDisplayName;
-    }
-
-    @JsonProperty("catalogSourceDisplayName")
-    public void setCatalogSourceDisplayName(String catalogSourceDisplayName) {
-        this.catalogSourceDisplayName = catalogSourceDisplayName;
-    }
-
-    @JsonProperty("catalogSourceNamespace")
-    public String getCatalogSourceNamespace() {
-        return catalogSourceNamespace;
-    }
-
-    @JsonProperty("catalogSourceNamespace")
-    public void setCatalogSourceNamespace(String catalogSourceNamespace) {
-        this.catalogSourceNamespace = catalogSourceNamespace;
-    }
-
-    @JsonProperty("catalogSourcePublisher")
-    public String getCatalogSourcePublisher() {
-        return catalogSourcePublisher;
-    }
-
-    @JsonProperty("catalogSourcePublisher")
-    public void setCatalogSourcePublisher(String catalogSourcePublisher) {
-        this.catalogSourcePublisher = catalogSourcePublisher;
-    }
-
-    @JsonProperty("channels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<PackageChannel> getChannels() {
-        return channels;
-    }
-
-    @JsonProperty("channels")
-    public void setChannels(List<PackageChannel> channels) {
-        this.channels = channels;
-    }
-
-    @JsonProperty("defaultChannel")
-    public String getDefaultChannel() {
-        return defaultChannel;
-    }
-
-    @JsonProperty("defaultChannel")
-    public void setDefaultChannel(String defaultChannel) {
-        this.defaultChannel = defaultChannel;
-    }
-
-    @JsonProperty("deprecation")
-    public Deprecation getDeprecation() {
-        return deprecation;
-    }
-
-    @JsonProperty("deprecation")
-    public void setDeprecation(Deprecation deprecation) {
-        this.deprecation = deprecation;
-    }
-
-    @JsonProperty("packageName")
-    public String getPackageName() {
-        return packageName;
-    }
-
-    @JsonProperty("packageName")
-    public void setPackageName(String packageName) {
-        this.packageName = packageName;
-    }
-
-    @JsonProperty("provider")
-    public AppLink getProvider() {
-        return provider;
-    }
-
-    @JsonProperty("provider")
-    public void setProvider(AppLink provider) {
-        this.provider = provider;
-    }
-
-    @JsonIgnore
-    public PackageManifestStatusBuilder edit() {
-        return new PackageManifestStatusBuilder(this);
-    }
-
-    @JsonIgnore
-    public PackageManifestStatusBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorStatusComponents.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/Components.java
similarity index 81%
rename from kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorStatusComponents.java
rename to kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/Components.java
index 9f0a1c3c2f5..98c92383e81 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorStatusComponents.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/Components.java
@@ -54,14 +54,14 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class OperatorStatusComponents implements Editable<OperatorStatusComponentsBuilder> , KubernetesResource
+public class Components implements Editable<ComponentsBuilder> , KubernetesResource
 {
 
     @JsonProperty("labelSelector")
-    private OperatorStatusCLabelSelector labelSelector;
+    private LabelSelector labelSelector;
     @JsonProperty("refs")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<OperatorStatusCRefs> refs = new ArrayList<>();
+    private List<RichReference> refs = new ArrayList<>();
     @JsonIgnore
     private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
 
@@ -69,43 +69,43 @@ public class OperatorStatusComponents implements Editable<OperatorStatusComponen
      * No args constructor for use in serialization
      * 
      */
-    public OperatorStatusComponents() {
+    public Components() {
     }
 
-    public OperatorStatusComponents(OperatorStatusCLabelSelector labelSelector, List<OperatorStatusCRefs> refs) {
+    public Components(LabelSelector labelSelector, List<RichReference> refs) {
         super();
         this.labelSelector = labelSelector;
         this.refs = refs;
     }
 
     @JsonProperty("labelSelector")
-    public OperatorStatusCLabelSelector getLabelSelector() {
+    public LabelSelector getLabelSelector() {
         return labelSelector;
     }
 
     @JsonProperty("labelSelector")
-    public void setLabelSelector(OperatorStatusCLabelSelector labelSelector) {
+    public void setLabelSelector(LabelSelector labelSelector) {
         this.labelSelector = labelSelector;
     }
 
     @JsonProperty("refs")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<OperatorStatusCRefs> getRefs() {
+    public List<RichReference> getRefs() {
         return refs;
     }
 
     @JsonProperty("refs")
-    public void setRefs(List<OperatorStatusCRefs> refs) {
+    public void setRefs(List<RichReference> refs) {
         this.refs = refs;
     }
 
     @JsonIgnore
-    public OperatorStatusComponentsBuilder edit() {
-        return new OperatorStatusComponentsBuilder(this);
+    public ComponentsBuilder edit() {
+        return new ComponentsBuilder(this);
     }
 
     @JsonIgnore
-    public OperatorStatusComponentsBuilder toBuilder() {
+    public ComponentsBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorStatusCRConditions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/Condition.java
similarity index 91%
rename from kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorStatusCRConditions.java
rename to kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/Condition.java
index d308ce3c18e..ccbfc41e026 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorStatusCRConditions.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/Condition.java
@@ -56,7 +56,7 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class OperatorStatusCRConditions implements Editable<OperatorStatusCRConditionsBuilder> , KubernetesResource
+public class Condition implements Editable<ConditionBuilder> , KubernetesResource
 {
 
     @JsonProperty("lastTransitionTime")
@@ -78,10 +78,10 @@ public class OperatorStatusCRConditions implements Editable<OperatorStatusCRCond
      * No args constructor for use in serialization
      * 
      */
-    public OperatorStatusCRConditions() {
+    public Condition() {
     }
 
-    public OperatorStatusCRConditions(String lastTransitionTime, String lastUpdateTime, String message, String reason, String status, String type) {
+    public Condition(String lastTransitionTime, String lastUpdateTime, String message, String reason, String status, String type) {
         super();
         this.lastTransitionTime = lastTransitionTime;
         this.lastUpdateTime = lastUpdateTime;
@@ -152,12 +152,12 @@ public void setType(String type) {
     }
 
     @JsonIgnore
-    public OperatorStatusCRConditionsBuilder edit() {
-        return new OperatorStatusCRConditionsBuilder(this);
+    public ConditionBuilder edit() {
+        return new ConditionBuilder(this);
     }
 
     @JsonIgnore
-    public OperatorStatusCRConditionsBuilder toBuilder() {
+    public ConditionBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OLMConfigSpecFeatures.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/Features.java
similarity index 90%
rename from kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OLMConfigSpecFeatures.java
rename to kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/Features.java
index 696a4f59731..709676730bd 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OLMConfigSpecFeatures.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/Features.java
@@ -52,7 +52,7 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class OLMConfigSpecFeatures implements Editable<OLMConfigSpecFeaturesBuilder> , KubernetesResource
+public class Features implements Editable<FeaturesBuilder> , KubernetesResource
 {
 
     @JsonProperty("disableCopiedCSVs")
@@ -66,10 +66,10 @@ public class OLMConfigSpecFeatures implements Editable<OLMConfigSpecFeaturesBuil
      * No args constructor for use in serialization
      * 
      */
-    public OLMConfigSpecFeatures() {
+    public Features() {
     }
 
-    public OLMConfigSpecFeatures(Boolean disableCopiedCSVs, String packageServerSyncInterval) {
+    public Features(Boolean disableCopiedCSVs, String packageServerSyncInterval) {
         super();
         this.disableCopiedCSVs = disableCopiedCSVs;
         this.packageServerSyncInterval = packageServerSyncInterval;
@@ -96,12 +96,12 @@ public void setPackageServerSyncInterval(String packageServerSyncInterval) {
     }
 
     @JsonIgnore
-    public OLMConfigSpecFeaturesBuilder edit() {
-        return new OLMConfigSpecFeaturesBuilder(this);
+    public FeaturesBuilder edit() {
+        return new FeaturesBuilder(this);
     }
 
     @JsonIgnore
-    public OLMConfigSpecFeaturesBuilder toBuilder() {
+    public FeaturesBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OLMConfigSpec.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OLMConfigSpec.java
index 828006bdb70..cdc225b222b 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OLMConfigSpec.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OLMConfigSpec.java
@@ -55,7 +55,7 @@ public class OLMConfigSpec implements Editable<OLMConfigSpecBuilder> , Kubernete
 {
 
     @JsonProperty("features")
-    private OLMConfigSpecFeatures features;
+    private Features features;
     @JsonIgnore
     private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
 
@@ -66,18 +66,18 @@ public class OLMConfigSpec implements Editable<OLMConfigSpecBuilder> , Kubernete
     public OLMConfigSpec() {
     }
 
-    public OLMConfigSpec(OLMConfigSpecFeatures features) {
+    public OLMConfigSpec(Features features) {
         super();
         this.features = features;
     }
 
     @JsonProperty("features")
-    public OLMConfigSpecFeatures getFeatures() {
+    public Features getFeatures() {
         return features;
     }
 
     @JsonProperty("features")
-    public void setFeatures(OLMConfigSpecFeatures features) {
+    public void setFeatures(Features features) {
         this.features = features;
     }
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OLMConfigStatus.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OLMConfigStatus.java
index b4014ab1a4a..e51d6f13010 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OLMConfigStatus.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OLMConfigStatus.java
@@ -14,6 +14,7 @@
 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.Condition;
 import io.fabric8.kubernetes.api.model.Container;
 import io.fabric8.kubernetes.api.model.IntOrString;
 import io.fabric8.kubernetes.api.model.KubernetesResource;
@@ -58,7 +59,7 @@ public class OLMConfigStatus implements Editable<OLMConfigStatusBuilder> , Kuber
 
     @JsonProperty("conditions")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<OLMConfigStatusConditions> conditions = new ArrayList<>();
+    private List<Condition> conditions = new ArrayList<>();
     @JsonIgnore
     private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
 
@@ -69,19 +70,19 @@ public class OLMConfigStatus implements Editable<OLMConfigStatusBuilder> , Kuber
     public OLMConfigStatus() {
     }
 
-    public OLMConfigStatus(List<OLMConfigStatusConditions> conditions) {
+    public OLMConfigStatus(List<Condition> conditions) {
         super();
         this.conditions = conditions;
     }
 
     @JsonProperty("conditions")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<OLMConfigStatusConditions> getConditions() {
+    public List<Condition> getConditions() {
         return conditions;
     }
 
     @JsonProperty("conditions")
-    public void setConditions(List<OLMConfigStatusConditions> conditions) {
+    public void setConditions(List<Condition> conditions) {
         this.conditions = conditions;
     }
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OLMConfigStatusConditions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OLMConfigStatusConditions.java
deleted file mode 100644
index 3eee4c4751f..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OLMConfigStatusConditions.java
+++ /dev/null
@@ -1,178 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.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({
-    "lastTransitionTime",
-    "message",
-    "observedGeneration",
-    "reason",
-    "status",
-    "type"
-})
-@ToString
-@EqualsAndHashCode
-@Accessors(prefix = {
-    "_",
-    ""
-})
-@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
-    @BuildableReference(ObjectMeta.class),
-    @BuildableReference(LabelSelector.class),
-    @BuildableReference(Container.class),
-    @BuildableReference(PodTemplateSpec.class),
-    @BuildableReference(ResourceRequirements.class),
-    @BuildableReference(IntOrString.class),
-    @BuildableReference(ObjectReference.class),
-    @BuildableReference(LocalObjectReference.class),
-    @BuildableReference(PersistentVolumeClaim.class)
-})
-@Generated("jsonschema2pojo")
-public class OLMConfigStatusConditions implements Editable<OLMConfigStatusConditionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("lastTransitionTime")
-    private String lastTransitionTime;
-    @JsonProperty("message")
-    private String message;
-    @JsonProperty("observedGeneration")
-    private Long observedGeneration;
-    @JsonProperty("reason")
-    private String reason;
-    @JsonProperty("status")
-    private String status;
-    @JsonProperty("type")
-    private String type;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public OLMConfigStatusConditions() {
-    }
-
-    public OLMConfigStatusConditions(String lastTransitionTime, String message, Long observedGeneration, String reason, String status, String type) {
-        super();
-        this.lastTransitionTime = lastTransitionTime;
-        this.message = message;
-        this.observedGeneration = observedGeneration;
-        this.reason = reason;
-        this.status = status;
-        this.type = type;
-    }
-
-    @JsonProperty("lastTransitionTime")
-    public String getLastTransitionTime() {
-        return lastTransitionTime;
-    }
-
-    @JsonProperty("lastTransitionTime")
-    public void setLastTransitionTime(String lastTransitionTime) {
-        this.lastTransitionTime = lastTransitionTime;
-    }
-
-    @JsonProperty("message")
-    public String getMessage() {
-        return message;
-    }
-
-    @JsonProperty("message")
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    @JsonProperty("observedGeneration")
-    public Long getObservedGeneration() {
-        return observedGeneration;
-    }
-
-    @JsonProperty("observedGeneration")
-    public void setObservedGeneration(Long observedGeneration) {
-        this.observedGeneration = observedGeneration;
-    }
-
-    @JsonProperty("reason")
-    public String getReason() {
-        return reason;
-    }
-
-    @JsonProperty("reason")
-    public void setReason(String reason) {
-        this.reason = reason;
-    }
-
-    @JsonProperty("status")
-    public String getStatus() {
-        return status;
-    }
-
-    @JsonProperty("status")
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    @JsonProperty("type")
-    public String getType() {
-        return type;
-    }
-
-    @JsonProperty("type")
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    @JsonIgnore
-    public OLMConfigStatusConditionsBuilder edit() {
-        return new OLMConfigStatusConditionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public OLMConfigStatusConditionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/Operator.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/Operator.java
index e784db0b6cf..3eee7d72400 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/Operator.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/Operator.java
@@ -84,8 +84,7 @@ public class Operator implements Editable<OperatorBuilder> , HasMetadata
     @JsonProperty("metadata")
     private ObjectMeta metadata;
     @JsonProperty("spec")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object spec;
+    private OperatorSpec spec;
     @JsonProperty("status")
     private OperatorStatus status;
     @JsonIgnore
@@ -98,7 +97,7 @@ public class Operator implements Editable<OperatorBuilder> , HasMetadata
     public Operator() {
     }
 
-    public Operator(String apiVersion, String kind, ObjectMeta metadata, Object spec, OperatorStatus status) {
+    public Operator(String apiVersion, String kind, ObjectMeta metadata, OperatorSpec spec, OperatorStatus status) {
         super();
         this.apiVersion = apiVersion;
         this.kind = kind;
@@ -158,13 +157,12 @@ public void setMetadata(ObjectMeta metadata) {
     }
 
     @JsonProperty("spec")
-    public Object getSpec() {
+    public OperatorSpec getSpec() {
         return spec;
     }
 
     @JsonProperty("spec")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setSpec(Object spec) {
+    public void setSpec(OperatorSpec spec) {
         this.spec = spec;
     }
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorConditionSpec.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorConditionSpec.java
index a0327849b94..21b02ffdee5 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorConditionSpec.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorConditionSpec.java
@@ -14,6 +14,7 @@
 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.Condition;
 import io.fabric8.kubernetes.api.model.Container;
 import io.fabric8.kubernetes.api.model.IntOrString;
 import io.fabric8.kubernetes.api.model.KubernetesResource;
@@ -63,7 +64,7 @@ public class OperatorConditionSpec implements Editable<OperatorConditionSpecBuil
     private List<String> deployments = new ArrayList<>();
     @JsonProperty("overrides")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<OperatorConditionSpecOverrides> overrides = new ArrayList<>();
+    private List<Condition> overrides = new ArrayList<>();
     @JsonProperty("serviceAccounts")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private List<String> serviceAccounts = new ArrayList<>();
@@ -77,7 +78,7 @@ public class OperatorConditionSpec implements Editable<OperatorConditionSpecBuil
     public OperatorConditionSpec() {
     }
 
-    public OperatorConditionSpec(List<String> deployments, List<OperatorConditionSpecOverrides> overrides, List<String> serviceAccounts) {
+    public OperatorConditionSpec(List<String> deployments, List<Condition> overrides, List<String> serviceAccounts) {
         super();
         this.deployments = deployments;
         this.overrides = overrides;
@@ -97,12 +98,12 @@ public void setDeployments(List<String> deployments) {
 
     @JsonProperty("overrides")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<OperatorConditionSpecOverrides> getOverrides() {
+    public List<Condition> getOverrides() {
         return overrides;
     }
 
     @JsonProperty("overrides")
-    public void setOverrides(List<OperatorConditionSpecOverrides> overrides) {
+    public void setOverrides(List<Condition> overrides) {
         this.overrides = overrides;
     }
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorConditionSpecOverrides.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorConditionSpecOverrides.java
deleted file mode 100644
index 9c7b3bd68d3..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorConditionSpecOverrides.java
+++ /dev/null
@@ -1,178 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.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({
-    "lastTransitionTime",
-    "message",
-    "observedGeneration",
-    "reason",
-    "status",
-    "type"
-})
-@ToString
-@EqualsAndHashCode
-@Accessors(prefix = {
-    "_",
-    ""
-})
-@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
-    @BuildableReference(ObjectMeta.class),
-    @BuildableReference(LabelSelector.class),
-    @BuildableReference(Container.class),
-    @BuildableReference(PodTemplateSpec.class),
-    @BuildableReference(ResourceRequirements.class),
-    @BuildableReference(IntOrString.class),
-    @BuildableReference(ObjectReference.class),
-    @BuildableReference(LocalObjectReference.class),
-    @BuildableReference(PersistentVolumeClaim.class)
-})
-@Generated("jsonschema2pojo")
-public class OperatorConditionSpecOverrides implements Editable<OperatorConditionSpecOverridesBuilder> , KubernetesResource
-{
-
-    @JsonProperty("lastTransitionTime")
-    private String lastTransitionTime;
-    @JsonProperty("message")
-    private String message;
-    @JsonProperty("observedGeneration")
-    private Long observedGeneration;
-    @JsonProperty("reason")
-    private String reason;
-    @JsonProperty("status")
-    private String status;
-    @JsonProperty("type")
-    private String type;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public OperatorConditionSpecOverrides() {
-    }
-
-    public OperatorConditionSpecOverrides(String lastTransitionTime, String message, Long observedGeneration, String reason, String status, String type) {
-        super();
-        this.lastTransitionTime = lastTransitionTime;
-        this.message = message;
-        this.observedGeneration = observedGeneration;
-        this.reason = reason;
-        this.status = status;
-        this.type = type;
-    }
-
-    @JsonProperty("lastTransitionTime")
-    public String getLastTransitionTime() {
-        return lastTransitionTime;
-    }
-
-    @JsonProperty("lastTransitionTime")
-    public void setLastTransitionTime(String lastTransitionTime) {
-        this.lastTransitionTime = lastTransitionTime;
-    }
-
-    @JsonProperty("message")
-    public String getMessage() {
-        return message;
-    }
-
-    @JsonProperty("message")
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    @JsonProperty("observedGeneration")
-    public Long getObservedGeneration() {
-        return observedGeneration;
-    }
-
-    @JsonProperty("observedGeneration")
-    public void setObservedGeneration(Long observedGeneration) {
-        this.observedGeneration = observedGeneration;
-    }
-
-    @JsonProperty("reason")
-    public String getReason() {
-        return reason;
-    }
-
-    @JsonProperty("reason")
-    public void setReason(String reason) {
-        this.reason = reason;
-    }
-
-    @JsonProperty("status")
-    public String getStatus() {
-        return status;
-    }
-
-    @JsonProperty("status")
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    @JsonProperty("type")
-    public String getType() {
-        return type;
-    }
-
-    @JsonProperty("type")
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    @JsonIgnore
-    public OperatorConditionSpecOverridesBuilder edit() {
-        return new OperatorConditionSpecOverridesBuilder(this);
-    }
-
-    @JsonIgnore
-    public OperatorConditionSpecOverridesBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorConditionStatus.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorConditionStatus.java
index a0b09fbab1c..9cb80e85ba9 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorConditionStatus.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorConditionStatus.java
@@ -14,6 +14,7 @@
 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.Condition;
 import io.fabric8.kubernetes.api.model.Container;
 import io.fabric8.kubernetes.api.model.IntOrString;
 import io.fabric8.kubernetes.api.model.KubernetesResource;
@@ -58,7 +59,7 @@ public class OperatorConditionStatus implements Editable<OperatorConditionStatus
 
     @JsonProperty("conditions")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<OperatorConditionStatusConditions> conditions = new ArrayList<>();
+    private List<Condition> conditions = new ArrayList<>();
     @JsonIgnore
     private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
 
@@ -69,19 +70,19 @@ public class OperatorConditionStatus implements Editable<OperatorConditionStatus
     public OperatorConditionStatus() {
     }
 
-    public OperatorConditionStatus(List<OperatorConditionStatusConditions> conditions) {
+    public OperatorConditionStatus(List<Condition> conditions) {
         super();
         this.conditions = conditions;
     }
 
     @JsonProperty("conditions")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<OperatorConditionStatusConditions> getConditions() {
+    public List<Condition> getConditions() {
         return conditions;
     }
 
     @JsonProperty("conditions")
-    public void setConditions(List<OperatorConditionStatusConditions> conditions) {
+    public void setConditions(List<Condition> conditions) {
         this.conditions = conditions;
     }
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorConditionStatusConditions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorConditionStatusConditions.java
deleted file mode 100644
index 9b0c57336b6..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorConditionStatusConditions.java
+++ /dev/null
@@ -1,178 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.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({
-    "lastTransitionTime",
-    "message",
-    "observedGeneration",
-    "reason",
-    "status",
-    "type"
-})
-@ToString
-@EqualsAndHashCode
-@Accessors(prefix = {
-    "_",
-    ""
-})
-@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
-    @BuildableReference(ObjectMeta.class),
-    @BuildableReference(LabelSelector.class),
-    @BuildableReference(Container.class),
-    @BuildableReference(PodTemplateSpec.class),
-    @BuildableReference(ResourceRequirements.class),
-    @BuildableReference(IntOrString.class),
-    @BuildableReference(ObjectReference.class),
-    @BuildableReference(LocalObjectReference.class),
-    @BuildableReference(PersistentVolumeClaim.class)
-})
-@Generated("jsonschema2pojo")
-public class OperatorConditionStatusConditions implements Editable<OperatorConditionStatusConditionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("lastTransitionTime")
-    private String lastTransitionTime;
-    @JsonProperty("message")
-    private String message;
-    @JsonProperty("observedGeneration")
-    private Long observedGeneration;
-    @JsonProperty("reason")
-    private String reason;
-    @JsonProperty("status")
-    private String status;
-    @JsonProperty("type")
-    private String type;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public OperatorConditionStatusConditions() {
-    }
-
-    public OperatorConditionStatusConditions(String lastTransitionTime, String message, Long observedGeneration, String reason, String status, String type) {
-        super();
-        this.lastTransitionTime = lastTransitionTime;
-        this.message = message;
-        this.observedGeneration = observedGeneration;
-        this.reason = reason;
-        this.status = status;
-        this.type = type;
-    }
-
-    @JsonProperty("lastTransitionTime")
-    public String getLastTransitionTime() {
-        return lastTransitionTime;
-    }
-
-    @JsonProperty("lastTransitionTime")
-    public void setLastTransitionTime(String lastTransitionTime) {
-        this.lastTransitionTime = lastTransitionTime;
-    }
-
-    @JsonProperty("message")
-    public String getMessage() {
-        return message;
-    }
-
-    @JsonProperty("message")
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    @JsonProperty("observedGeneration")
-    public Long getObservedGeneration() {
-        return observedGeneration;
-    }
-
-    @JsonProperty("observedGeneration")
-    public void setObservedGeneration(Long observedGeneration) {
-        this.observedGeneration = observedGeneration;
-    }
-
-    @JsonProperty("reason")
-    public String getReason() {
-        return reason;
-    }
-
-    @JsonProperty("reason")
-    public void setReason(String reason) {
-        this.reason = reason;
-    }
-
-    @JsonProperty("status")
-    public String getStatus() {
-        return status;
-    }
-
-    @JsonProperty("status")
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    @JsonProperty("type")
-    public String getType() {
-        return type;
-    }
-
-    @JsonProperty("type")
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    @JsonIgnore
-    public OperatorConditionStatusConditionsBuilder edit() {
-        return new OperatorConditionStatusConditionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public OperatorConditionStatusConditionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorGroupSpec.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorGroupSpec.java
index f7738c37c73..61dd0e86d83 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorGroupSpec.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorGroupSpec.java
@@ -61,7 +61,7 @@ public class OperatorGroupSpec implements Editable<OperatorGroupSpecBuilder> , K
 {
 
     @JsonProperty("selector")
-    private OperatorGroupSpecSelector selector;
+    private LabelSelector selector;
     @JsonProperty("serviceAccountName")
     private String serviceAccountName;
     @JsonProperty("staticProvidedAPIs")
@@ -81,7 +81,7 @@ public class OperatorGroupSpec implements Editable<OperatorGroupSpecBuilder> , K
     public OperatorGroupSpec() {
     }
 
-    public OperatorGroupSpec(OperatorGroupSpecSelector selector, String serviceAccountName, Boolean staticProvidedAPIs, List<String> targetNamespaces, String upgradeStrategy) {
+    public OperatorGroupSpec(LabelSelector selector, String serviceAccountName, Boolean staticProvidedAPIs, List<String> targetNamespaces, String upgradeStrategy) {
         super();
         this.selector = selector;
         this.serviceAccountName = serviceAccountName;
@@ -91,12 +91,12 @@ public OperatorGroupSpec(OperatorGroupSpecSelector selector, String serviceAccou
     }
 
     @JsonProperty("selector")
-    public OperatorGroupSpecSelector getSelector() {
+    public LabelSelector getSelector() {
         return selector;
     }
 
     @JsonProperty("selector")
-    public void setSelector(OperatorGroupSpecSelector selector) {
+    public void setSelector(LabelSelector selector) {
         this.selector = selector;
     }
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorGroupSpecSMatchExpressions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorGroupSpecSMatchExpressions.java
deleted file mode 100644
index baa49bd7733..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorGroupSpecSMatchExpressions.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.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({
-    "key",
-    "operator",
-    "values"
-})
-@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 OperatorGroupSpecSMatchExpressions implements Editable<OperatorGroupSpecSMatchExpressionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("operator")
-    private String operator;
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> values = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public OperatorGroupSpecSMatchExpressions() {
-    }
-
-    public OperatorGroupSpecSMatchExpressions(String key, String operator, List<String> values) {
-        super();
-        this.key = key;
-        this.operator = operator;
-        this.values = values;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("operator")
-    public String getOperator() {
-        return operator;
-    }
-
-    @JsonProperty("operator")
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getValues() {
-        return values;
-    }
-
-    @JsonProperty("values")
-    public void setValues(List<String> values) {
-        this.values = values;
-    }
-
-    @JsonIgnore
-    public OperatorGroupSpecSMatchExpressionsBuilder edit() {
-        return new OperatorGroupSpecSMatchExpressionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public OperatorGroupSpecSMatchExpressionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorGroupSpecSelector.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorGroupSpecSelector.java
deleted file mode 100644
index d61c5afd6c1..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorGroupSpecSelector.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.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({
-    "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 OperatorGroupSpecSelector implements Editable<OperatorGroupSpecSelectorBuilder> , KubernetesResource
-{
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<OperatorGroupSpecSMatchExpressions> matchExpressions = new ArrayList<>();
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, String> matchLabels = new LinkedHashMap<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public OperatorGroupSpecSelector() {
-    }
-
-    public OperatorGroupSpecSelector(List<OperatorGroupSpecSMatchExpressions> matchExpressions, Map<String, String> matchLabels) {
-        super();
-        this.matchExpressions = matchExpressions;
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<OperatorGroupSpecSMatchExpressions> getMatchExpressions() {
-        return matchExpressions;
-    }
-
-    @JsonProperty("matchExpressions")
-    public void setMatchExpressions(List<OperatorGroupSpecSMatchExpressions> matchExpressions) {
-        this.matchExpressions = matchExpressions;
-    }
-
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, String> getMatchLabels() {
-        return matchLabels;
-    }
-
-    @JsonProperty("matchLabels")
-    public void setMatchLabels(Map<String, String> matchLabels) {
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonIgnore
-    public OperatorGroupSpecSelectorBuilder edit() {
-        return new OperatorGroupSpecSelectorBuilder(this);
-    }
-
-    @JsonIgnore
-    public OperatorGroupSpecSelectorBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorGroupStatus.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorGroupStatus.java
index 761b1ac888c..8fe41d45ab2 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorGroupStatus.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorGroupStatus.java
@@ -14,6 +14,7 @@
 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.Condition;
 import io.fabric8.kubernetes.api.model.Container;
 import io.fabric8.kubernetes.api.model.IntOrString;
 import io.fabric8.kubernetes.api.model.KubernetesResource;
@@ -61,14 +62,14 @@ public class OperatorGroupStatus implements Editable<OperatorGroupStatusBuilder>
 
     @JsonProperty("conditions")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<OperatorGroupStatusConditions> conditions = new ArrayList<>();
+    private List<Condition> conditions = new ArrayList<>();
     @JsonProperty("lastUpdated")
     private String lastUpdated;
     @JsonProperty("namespaces")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private List<String> namespaces = new ArrayList<>();
     @JsonProperty("serviceAccountRef")
-    private OperatorGroupStatusServiceAccountRef serviceAccountRef;
+    private ObjectReference serviceAccountRef;
     @JsonIgnore
     private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
 
@@ -79,7 +80,7 @@ public class OperatorGroupStatus implements Editable<OperatorGroupStatusBuilder>
     public OperatorGroupStatus() {
     }
 
-    public OperatorGroupStatus(List<OperatorGroupStatusConditions> conditions, String lastUpdated, List<String> namespaces, OperatorGroupStatusServiceAccountRef serviceAccountRef) {
+    public OperatorGroupStatus(List<Condition> conditions, String lastUpdated, List<String> namespaces, ObjectReference serviceAccountRef) {
         super();
         this.conditions = conditions;
         this.lastUpdated = lastUpdated;
@@ -89,12 +90,12 @@ public OperatorGroupStatus(List<OperatorGroupStatusConditions> conditions, Strin
 
     @JsonProperty("conditions")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<OperatorGroupStatusConditions> getConditions() {
+    public List<Condition> getConditions() {
         return conditions;
     }
 
     @JsonProperty("conditions")
-    public void setConditions(List<OperatorGroupStatusConditions> conditions) {
+    public void setConditions(List<Condition> conditions) {
         this.conditions = conditions;
     }
 
@@ -120,12 +121,12 @@ public void setNamespaces(List<String> namespaces) {
     }
 
     @JsonProperty("serviceAccountRef")
-    public OperatorGroupStatusServiceAccountRef getServiceAccountRef() {
+    public ObjectReference getServiceAccountRef() {
         return serviceAccountRef;
     }
 
     @JsonProperty("serviceAccountRef")
-    public void setServiceAccountRef(OperatorGroupStatusServiceAccountRef serviceAccountRef) {
+    public void setServiceAccountRef(ObjectReference serviceAccountRef) {
         this.serviceAccountRef = serviceAccountRef;
     }
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorGroupStatusConditions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorGroupStatusConditions.java
deleted file mode 100644
index e05c086d7a6..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorGroupStatusConditions.java
+++ /dev/null
@@ -1,178 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.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({
-    "lastTransitionTime",
-    "message",
-    "observedGeneration",
-    "reason",
-    "status",
-    "type"
-})
-@ToString
-@EqualsAndHashCode
-@Accessors(prefix = {
-    "_",
-    ""
-})
-@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
-    @BuildableReference(ObjectMeta.class),
-    @BuildableReference(LabelSelector.class),
-    @BuildableReference(Container.class),
-    @BuildableReference(PodTemplateSpec.class),
-    @BuildableReference(ResourceRequirements.class),
-    @BuildableReference(IntOrString.class),
-    @BuildableReference(ObjectReference.class),
-    @BuildableReference(LocalObjectReference.class),
-    @BuildableReference(PersistentVolumeClaim.class)
-})
-@Generated("jsonschema2pojo")
-public class OperatorGroupStatusConditions implements Editable<OperatorGroupStatusConditionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("lastTransitionTime")
-    private String lastTransitionTime;
-    @JsonProperty("message")
-    private String message;
-    @JsonProperty("observedGeneration")
-    private Long observedGeneration;
-    @JsonProperty("reason")
-    private String reason;
-    @JsonProperty("status")
-    private String status;
-    @JsonProperty("type")
-    private String type;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public OperatorGroupStatusConditions() {
-    }
-
-    public OperatorGroupStatusConditions(String lastTransitionTime, String message, Long observedGeneration, String reason, String status, String type) {
-        super();
-        this.lastTransitionTime = lastTransitionTime;
-        this.message = message;
-        this.observedGeneration = observedGeneration;
-        this.reason = reason;
-        this.status = status;
-        this.type = type;
-    }
-
-    @JsonProperty("lastTransitionTime")
-    public String getLastTransitionTime() {
-        return lastTransitionTime;
-    }
-
-    @JsonProperty("lastTransitionTime")
-    public void setLastTransitionTime(String lastTransitionTime) {
-        this.lastTransitionTime = lastTransitionTime;
-    }
-
-    @JsonProperty("message")
-    public String getMessage() {
-        return message;
-    }
-
-    @JsonProperty("message")
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    @JsonProperty("observedGeneration")
-    public Long getObservedGeneration() {
-        return observedGeneration;
-    }
-
-    @JsonProperty("observedGeneration")
-    public void setObservedGeneration(Long observedGeneration) {
-        this.observedGeneration = observedGeneration;
-    }
-
-    @JsonProperty("reason")
-    public String getReason() {
-        return reason;
-    }
-
-    @JsonProperty("reason")
-    public void setReason(String reason) {
-        this.reason = reason;
-    }
-
-    @JsonProperty("status")
-    public String getStatus() {
-        return status;
-    }
-
-    @JsonProperty("status")
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    @JsonProperty("type")
-    public String getType() {
-        return type;
-    }
-
-    @JsonProperty("type")
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    @JsonIgnore
-    public OperatorGroupStatusConditionsBuilder edit() {
-        return new OperatorGroupStatusConditionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public OperatorGroupStatusConditionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorGroupStatusServiceAccountRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorGroupStatusServiceAccountRef.java
deleted file mode 100644
index 08d29b8ef3e..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorGroupStatusServiceAccountRef.java
+++ /dev/null
@@ -1,192 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.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 OperatorGroupStatusServiceAccountRef implements Editable<OperatorGroupStatusServiceAccountRefBuilder> , 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<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public OperatorGroupStatusServiceAccountRef() {
-    }
-
-    public OperatorGroupStatusServiceAccountRef(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 OperatorGroupStatusServiceAccountRefBuilder edit() {
-        return new OperatorGroupStatusServiceAccountRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public OperatorGroupStatusServiceAccountRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/lifecyclemanager/v1/PackageManifestSpec.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorSpec.java
similarity index 89%
rename from kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/lifecyclemanager/v1/PackageManifestSpec.java
rename to kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorSpec.java
index f99f65d5fb9..e7fa1ab97a5 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/lifecyclemanager/v1/PackageManifestSpec.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorSpec.java
@@ -1,5 +1,5 @@
 
-package io.fabric8.openshift.api.model.operatorhub.lifecyclemanager.v1;
+package io.fabric8.openshift.api.model.operatorhub.v1;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -50,19 +50,19 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class PackageManifestSpec implements Editable<PackageManifestSpecBuilder> , KubernetesResource
+public class OperatorSpec implements Editable<OperatorSpecBuilder> , KubernetesResource
 {
 
     @JsonIgnore
     private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
 
     @JsonIgnore
-    public PackageManifestSpecBuilder edit() {
-        return new PackageManifestSpecBuilder(this);
+    public OperatorSpecBuilder edit() {
+        return new OperatorSpecBuilder(this);
     }
 
     @JsonIgnore
-    public PackageManifestSpecBuilder toBuilder() {
+    public OperatorSpecBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorStatus.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorStatus.java
index 4601495d8da..f716beb8f3b 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorStatus.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorStatus.java
@@ -55,7 +55,7 @@ public class OperatorStatus implements Editable<OperatorStatusBuilder> , Kuberne
 {
 
     @JsonProperty("components")
-    private OperatorStatusComponents components;
+    private Components components;
     @JsonIgnore
     private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
 
@@ -66,18 +66,18 @@ public class OperatorStatus implements Editable<OperatorStatusBuilder> , Kuberne
     public OperatorStatus() {
     }
 
-    public OperatorStatus(OperatorStatusComponents components) {
+    public OperatorStatus(Components components) {
         super();
         this.components = components;
     }
 
     @JsonProperty("components")
-    public OperatorStatusComponents getComponents() {
+    public Components getComponents() {
         return components;
     }
 
     @JsonProperty("components")
-    public void setComponents(OperatorStatusComponents components) {
+    public void setComponents(Components components) {
         this.components = components;
     }
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorStatusCLSMatchExpressions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorStatusCLSMatchExpressions.java
deleted file mode 100644
index 1fdd5f92c73..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorStatusCLSMatchExpressions.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.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({
-    "key",
-    "operator",
-    "values"
-})
-@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 OperatorStatusCLSMatchExpressions implements Editable<OperatorStatusCLSMatchExpressionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("operator")
-    private String operator;
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> values = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public OperatorStatusCLSMatchExpressions() {
-    }
-
-    public OperatorStatusCLSMatchExpressions(String key, String operator, List<String> values) {
-        super();
-        this.key = key;
-        this.operator = operator;
-        this.values = values;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("operator")
-    public String getOperator() {
-        return operator;
-    }
-
-    @JsonProperty("operator")
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getValues() {
-        return values;
-    }
-
-    @JsonProperty("values")
-    public void setValues(List<String> values) {
-        this.values = values;
-    }
-
-    @JsonIgnore
-    public OperatorStatusCLSMatchExpressionsBuilder edit() {
-        return new OperatorStatusCLSMatchExpressionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public OperatorStatusCLSMatchExpressionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorStatusCLabelSelector.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorStatusCLabelSelector.java
deleted file mode 100644
index f7cf7ba708b..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorStatusCLabelSelector.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.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({
-    "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 OperatorStatusCLabelSelector implements Editable<OperatorStatusCLabelSelectorBuilder> , KubernetesResource
-{
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<OperatorStatusCLSMatchExpressions> matchExpressions = new ArrayList<>();
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, String> matchLabels = new LinkedHashMap<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public OperatorStatusCLabelSelector() {
-    }
-
-    public OperatorStatusCLabelSelector(List<OperatorStatusCLSMatchExpressions> matchExpressions, Map<String, String> matchLabels) {
-        super();
-        this.matchExpressions = matchExpressions;
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<OperatorStatusCLSMatchExpressions> getMatchExpressions() {
-        return matchExpressions;
-    }
-
-    @JsonProperty("matchExpressions")
-    public void setMatchExpressions(List<OperatorStatusCLSMatchExpressions> matchExpressions) {
-        this.matchExpressions = matchExpressions;
-    }
-
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, String> getMatchLabels() {
-        return matchLabels;
-    }
-
-    @JsonProperty("matchLabels")
-    public void setMatchLabels(Map<String, String> matchLabels) {
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonIgnore
-    public OperatorStatusCLabelSelectorBuilder edit() {
-        return new OperatorStatusCLabelSelectorBuilder(this);
-    }
-
-    @JsonIgnore
-    public OperatorStatusCLabelSelectorBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorStatusCRefs.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/RichReference.java
similarity index 88%
rename from kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorStatusCRefs.java
rename to kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/RichReference.java
index 84ae6491a04..770c906a41a 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorStatusCRefs.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/RichReference.java
@@ -60,14 +60,14 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class OperatorStatusCRefs implements Editable<OperatorStatusCRefsBuilder> , KubernetesResource
+public class RichReference implements Editable<RichReferenceBuilder> , KubernetesResource
 {
 
     @JsonProperty("apiVersion")
     private String apiVersion;
     @JsonProperty("conditions")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<OperatorStatusCRConditions> conditions = new ArrayList<>();
+    private List<Condition> conditions = new ArrayList<>();
     @JsonProperty("fieldPath")
     private String fieldPath;
     @JsonProperty("kind")
@@ -87,10 +87,10 @@ public class OperatorStatusCRefs implements Editable<OperatorStatusCRefsBuilder>
      * No args constructor for use in serialization
      * 
      */
-    public OperatorStatusCRefs() {
+    public RichReference() {
     }
 
-    public OperatorStatusCRefs(String apiVersion, List<OperatorStatusCRConditions> conditions, String fieldPath, String kind, String name, String namespace, String resourceVersion, String uid) {
+    public RichReference(String apiVersion, List<Condition> conditions, String fieldPath, String kind, String name, String namespace, String resourceVersion, String uid) {
         super();
         this.apiVersion = apiVersion;
         this.conditions = conditions;
@@ -114,12 +114,12 @@ public void setApiVersion(String apiVersion) {
 
     @JsonProperty("conditions")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<OperatorStatusCRConditions> getConditions() {
+    public List<Condition> getConditions() {
         return conditions;
     }
 
     @JsonProperty("conditions")
-    public void setConditions(List<OperatorStatusCRConditions> conditions) {
+    public void setConditions(List<Condition> conditions) {
         this.conditions = conditions;
     }
 
@@ -184,12 +184,12 @@ public void setUid(String uid) {
     }
 
     @JsonIgnore
-    public OperatorStatusCRefsBuilder edit() {
-        return new OperatorStatusCRefsBuilder(this);
+    public RichReferenceBuilder edit() {
+        return new RichReferenceBuilder(this);
     }
 
     @JsonIgnore
-    public OperatorStatusCRefsBuilder toBuilder() {
+    public RichReferenceBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/lifecyclemanager/v1/AppLink.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/AppLink.java
similarity index 98%
rename from kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/lifecyclemanager/v1/AppLink.java
rename to kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/AppLink.java
index 6d70f291960..a0c9a2c7fc0 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/lifecyclemanager/v1/AppLink.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/AppLink.java
@@ -1,5 +1,5 @@
 
-package io.fabric8.openshift.api.model.operatorhub.lifecyclemanager.v1;
+package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/InstallPlanStatusBundleLookups.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/BundleLookup.java
similarity index 82%
rename from kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/InstallPlanStatusBundleLookups.java
rename to kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/BundleLookup.java
index 7eb06478d34..571090c544b 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/InstallPlanStatusBundleLookups.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/BundleLookup.java
@@ -58,14 +58,14 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class InstallPlanStatusBundleLookups implements Editable<InstallPlanStatusBundleLookupsBuilder> , KubernetesResource
+public class BundleLookup implements Editable<BundleLookupBuilder> , KubernetesResource
 {
 
     @JsonProperty("catalogSourceRef")
-    private InstallPlanStatusBLCatalogSourceRef catalogSourceRef;
+    private ObjectReference catalogSourceRef;
     @JsonProperty("conditions")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<InstallPlanStatusBLConditions> conditions = new ArrayList<>();
+    private List<BundleLookupCondition> conditions = new ArrayList<>();
     @JsonProperty("identifier")
     private String identifier;
     @JsonProperty("path")
@@ -81,10 +81,10 @@ public class InstallPlanStatusBundleLookups implements Editable<InstallPlanStatu
      * No args constructor for use in serialization
      * 
      */
-    public InstallPlanStatusBundleLookups() {
+    public BundleLookup() {
     }
 
-    public InstallPlanStatusBundleLookups(InstallPlanStatusBLCatalogSourceRef catalogSourceRef, List<InstallPlanStatusBLConditions> conditions, String identifier, String path, String properties, String replaces) {
+    public BundleLookup(ObjectReference catalogSourceRef, List<BundleLookupCondition> conditions, String identifier, String path, String properties, String replaces) {
         super();
         this.catalogSourceRef = catalogSourceRef;
         this.conditions = conditions;
@@ -95,23 +95,23 @@ public InstallPlanStatusBundleLookups(InstallPlanStatusBLCatalogSourceRef catalo
     }
 
     @JsonProperty("catalogSourceRef")
-    public InstallPlanStatusBLCatalogSourceRef getCatalogSourceRef() {
+    public ObjectReference getCatalogSourceRef() {
         return catalogSourceRef;
     }
 
     @JsonProperty("catalogSourceRef")
-    public void setCatalogSourceRef(InstallPlanStatusBLCatalogSourceRef catalogSourceRef) {
+    public void setCatalogSourceRef(ObjectReference catalogSourceRef) {
         this.catalogSourceRef = catalogSourceRef;
     }
 
     @JsonProperty("conditions")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<InstallPlanStatusBLConditions> getConditions() {
+    public List<BundleLookupCondition> getConditions() {
         return conditions;
     }
 
     @JsonProperty("conditions")
-    public void setConditions(List<InstallPlanStatusBLConditions> conditions) {
+    public void setConditions(List<BundleLookupCondition> conditions) {
         this.conditions = conditions;
     }
 
@@ -156,12 +156,12 @@ public void setReplaces(String replaces) {
     }
 
     @JsonIgnore
-    public InstallPlanStatusBundleLookupsBuilder edit() {
-        return new InstallPlanStatusBundleLookupsBuilder(this);
+    public BundleLookupBuilder edit() {
+        return new BundleLookupBuilder(this);
     }
 
     @JsonIgnore
-    public InstallPlanStatusBundleLookupsBuilder toBuilder() {
+    public BundleLookupBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/InstallPlanStatusConditions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/BundleLookupCondition.java
similarity index 91%
rename from kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/InstallPlanStatusConditions.java
rename to kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/BundleLookupCondition.java
index 9c05c9d1aa1..aebe01efc7f 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/InstallPlanStatusConditions.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/BundleLookupCondition.java
@@ -56,7 +56,7 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class InstallPlanStatusConditions implements Editable<InstallPlanStatusConditionsBuilder> , KubernetesResource
+public class BundleLookupCondition implements Editable<BundleLookupConditionBuilder> , KubernetesResource
 {
 
     @JsonProperty("lastTransitionTime")
@@ -78,10 +78,10 @@ public class InstallPlanStatusConditions implements Editable<InstallPlanStatusCo
      * No args constructor for use in serialization
      * 
      */
-    public InstallPlanStatusConditions() {
+    public BundleLookupCondition() {
     }
 
-    public InstallPlanStatusConditions(String lastTransitionTime, String lastUpdateTime, String message, String reason, String status, String type) {
+    public BundleLookupCondition(String lastTransitionTime, String lastUpdateTime, String message, String reason, String status, String type) {
         super();
         this.lastTransitionTime = lastTransitionTime;
         this.lastUpdateTime = lastUpdateTime;
@@ -152,12 +152,12 @@ public void setType(String type) {
     }
 
     @JsonIgnore
-    public InstallPlanStatusConditionsBuilder edit() {
-        return new InstallPlanStatusConditionsBuilder(this);
+    public BundleLookupConditionBuilder edit() {
+        return new BundleLookupConditionBuilder(this);
     }
 
     @JsonIgnore
-    public InstallPlanStatusConditionsBuilder toBuilder() {
+    public BundleLookupConditionBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpec.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpec.java
index eadd168ac73..c75c6708ce0 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpec.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpec.java
@@ -42,7 +42,6 @@
     "image",
     "priority",
     "publisher",
-    "runAsRoot",
     "secrets",
     "sourceType",
     "updateStrategy"
@@ -77,24 +76,22 @@ public class CatalogSourceSpec implements Editable<CatalogSourceSpecBuilder> , K
     @JsonProperty("displayName")
     private String displayName;
     @JsonProperty("grpcPodConfig")
-    private CatalogSourceSpecGrpcPodConfig grpcPodConfig;
+    private GrpcPodConfig grpcPodConfig;
     @JsonProperty("icon")
-    private CatalogSourceSpecIcon icon;
+    private Icon icon;
     @JsonProperty("image")
     private String image;
     @JsonProperty("priority")
     private Integer priority;
     @JsonProperty("publisher")
     private String publisher;
-    @JsonProperty("runAsRoot")
-    private Boolean runAsRoot;
     @JsonProperty("secrets")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private List<String> secrets = new ArrayList<>();
     @JsonProperty("sourceType")
     private String sourceType;
     @JsonProperty("updateStrategy")
-    private CatalogSourceSpecUpdateStrategy updateStrategy;
+    private UpdateStrategy updateStrategy;
     @JsonIgnore
     private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
 
@@ -105,7 +102,7 @@ public class CatalogSourceSpec implements Editable<CatalogSourceSpecBuilder> , K
     public CatalogSourceSpec() {
     }
 
-    public CatalogSourceSpec(String address, String configMap, String description, String displayName, CatalogSourceSpecGrpcPodConfig grpcPodConfig, CatalogSourceSpecIcon icon, String image, Integer priority, String publisher, Boolean runAsRoot, List<String> secrets, String sourceType, CatalogSourceSpecUpdateStrategy updateStrategy) {
+    public CatalogSourceSpec(String address, String configMap, String description, String displayName, GrpcPodConfig grpcPodConfig, Icon icon, String image, Integer priority, String publisher, List<String> secrets, String sourceType, UpdateStrategy updateStrategy) {
         super();
         this.address = address;
         this.configMap = configMap;
@@ -116,7 +113,6 @@ public CatalogSourceSpec(String address, String configMap, String description, S
         this.image = image;
         this.priority = priority;
         this.publisher = publisher;
-        this.runAsRoot = runAsRoot;
         this.secrets = secrets;
         this.sourceType = sourceType;
         this.updateStrategy = updateStrategy;
@@ -163,22 +159,22 @@ public void setDisplayName(String displayName) {
     }
 
     @JsonProperty("grpcPodConfig")
-    public CatalogSourceSpecGrpcPodConfig getGrpcPodConfig() {
+    public GrpcPodConfig getGrpcPodConfig() {
         return grpcPodConfig;
     }
 
     @JsonProperty("grpcPodConfig")
-    public void setGrpcPodConfig(CatalogSourceSpecGrpcPodConfig grpcPodConfig) {
+    public void setGrpcPodConfig(GrpcPodConfig grpcPodConfig) {
         this.grpcPodConfig = grpcPodConfig;
     }
 
     @JsonProperty("icon")
-    public CatalogSourceSpecIcon getIcon() {
+    public Icon getIcon() {
         return icon;
     }
 
     @JsonProperty("icon")
-    public void setIcon(CatalogSourceSpecIcon icon) {
+    public void setIcon(Icon icon) {
         this.icon = icon;
     }
 
@@ -212,16 +208,6 @@ public void setPublisher(String publisher) {
         this.publisher = publisher;
     }
 
-    @JsonProperty("runAsRoot")
-    public Boolean getRunAsRoot() {
-        return runAsRoot;
-    }
-
-    @JsonProperty("runAsRoot")
-    public void setRunAsRoot(Boolean runAsRoot) {
-        this.runAsRoot = runAsRoot;
-    }
-
     @JsonProperty("secrets")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     public List<String> getSecrets() {
@@ -244,12 +230,12 @@ public void setSourceType(String sourceType) {
     }
 
     @JsonProperty("updateStrategy")
-    public CatalogSourceSpecUpdateStrategy getUpdateStrategy() {
+    public UpdateStrategy getUpdateStrategy() {
         return updateStrategy;
     }
 
     @JsonProperty("updateStrategy")
-    public void setUpdateStrategy(CatalogSourceSpecUpdateStrategy updateStrategy) {
+    public void setUpdateStrategy(UpdateStrategy updateStrategy) {
         this.updateStrategy = updateStrategy;
     }
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCANAPDSIDEPMatchExpressions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCANAPDSIDEPMatchExpressions.java
deleted file mode 100644
index a77bba54ea8..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCANAPDSIDEPMatchExpressions.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "operator",
-    "values"
-})
-@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 CatalogSourceSpecGPCANAPDSIDEPMatchExpressions implements Editable<CatalogSourceSpecGPCANAPDSIDEPMatchExpressionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("operator")
-    private String operator;
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> values = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public CatalogSourceSpecGPCANAPDSIDEPMatchExpressions() {
-    }
-
-    public CatalogSourceSpecGPCANAPDSIDEPMatchExpressions(String key, String operator, List<String> values) {
-        super();
-        this.key = key;
-        this.operator = operator;
-        this.values = values;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("operator")
-    public String getOperator() {
-        return operator;
-    }
-
-    @JsonProperty("operator")
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getValues() {
-        return values;
-    }
-
-    @JsonProperty("values")
-    public void setValues(List<String> values) {
-        this.values = values;
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCANAPDSIDEPMatchExpressionsBuilder edit() {
-        return new CatalogSourceSpecGPCANAPDSIDEPMatchExpressionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCANAPDSIDEPMatchExpressionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCANAPDSIDEPMatchFields.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCANAPDSIDEPMatchFields.java
deleted file mode 100644
index ce67e64215c..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCANAPDSIDEPMatchFields.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "operator",
-    "values"
-})
-@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 CatalogSourceSpecGPCANAPDSIDEPMatchFields implements Editable<CatalogSourceSpecGPCANAPDSIDEPMatchFieldsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("operator")
-    private String operator;
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> values = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public CatalogSourceSpecGPCANAPDSIDEPMatchFields() {
-    }
-
-    public CatalogSourceSpecGPCANAPDSIDEPMatchFields(String key, String operator, List<String> values) {
-        super();
-        this.key = key;
-        this.operator = operator;
-        this.values = values;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("operator")
-    public String getOperator() {
-        return operator;
-    }
-
-    @JsonProperty("operator")
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getValues() {
-        return values;
-    }
-
-    @JsonProperty("values")
-    public void setValues(List<String> values) {
-        this.values = values;
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCANAPDSIDEPMatchFieldsBuilder edit() {
-        return new CatalogSourceSpecGPCANAPDSIDEPMatchFieldsBuilder(this);
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCANAPDSIDEPMatchFieldsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCANAPDSIDEPreference.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCANAPDSIDEPreference.java
deleted file mode 100644
index 8169ca31787..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCANAPDSIDEPreference.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "matchExpressions",
-    "matchFields"
-})
-@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 CatalogSourceSpecGPCANAPDSIDEPreference implements Editable<CatalogSourceSpecGPCANAPDSIDEPreferenceBuilder> , KubernetesResource
-{
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<CatalogSourceSpecGPCANAPDSIDEPMatchExpressions> matchExpressions = new ArrayList<>();
-    @JsonProperty("matchFields")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<CatalogSourceSpecGPCANAPDSIDEPMatchFields> matchFields = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public CatalogSourceSpecGPCANAPDSIDEPreference() {
-    }
-
-    public CatalogSourceSpecGPCANAPDSIDEPreference(List<CatalogSourceSpecGPCANAPDSIDEPMatchExpressions> matchExpressions, List<CatalogSourceSpecGPCANAPDSIDEPMatchFields> matchFields) {
-        super();
-        this.matchExpressions = matchExpressions;
-        this.matchFields = matchFields;
-    }
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<CatalogSourceSpecGPCANAPDSIDEPMatchExpressions> getMatchExpressions() {
-        return matchExpressions;
-    }
-
-    @JsonProperty("matchExpressions")
-    public void setMatchExpressions(List<CatalogSourceSpecGPCANAPDSIDEPMatchExpressions> matchExpressions) {
-        this.matchExpressions = matchExpressions;
-    }
-
-    @JsonProperty("matchFields")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<CatalogSourceSpecGPCANAPDSIDEPMatchFields> getMatchFields() {
-        return matchFields;
-    }
-
-    @JsonProperty("matchFields")
-    public void setMatchFields(List<CatalogSourceSpecGPCANAPDSIDEPMatchFields> matchFields) {
-        this.matchFields = matchFields;
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCANAPDSIDEPreferenceBuilder edit() {
-        return new CatalogSourceSpecGPCANAPDSIDEPreferenceBuilder(this);
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCANAPDSIDEPreferenceBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCANAPreferredDuringSchedulingIgnoredDuringExecution.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCANAPreferredDuringSchedulingIgnoredDuringExecution.java
deleted file mode 100644
index 75302058003..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCANAPreferredDuringSchedulingIgnoredDuringExecution.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "preference",
-    "weight"
-})
-@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 CatalogSourceSpecGPCANAPreferredDuringSchedulingIgnoredDuringExecution implements Editable<CatalogSourceSpecGPCANAPreferredDuringSchedulingIgnoredDuringExecutionBuilder> , KubernetesResource
-{
-
-    @JsonProperty("preference")
-    private CatalogSourceSpecGPCANAPDSIDEPreference preference;
-    @JsonProperty("weight")
-    private Integer weight;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public CatalogSourceSpecGPCANAPreferredDuringSchedulingIgnoredDuringExecution() {
-    }
-
-    public CatalogSourceSpecGPCANAPreferredDuringSchedulingIgnoredDuringExecution(CatalogSourceSpecGPCANAPDSIDEPreference preference, Integer weight) {
-        super();
-        this.preference = preference;
-        this.weight = weight;
-    }
-
-    @JsonProperty("preference")
-    public CatalogSourceSpecGPCANAPDSIDEPreference getPreference() {
-        return preference;
-    }
-
-    @JsonProperty("preference")
-    public void setPreference(CatalogSourceSpecGPCANAPDSIDEPreference preference) {
-        this.preference = preference;
-    }
-
-    @JsonProperty("weight")
-    public Integer getWeight() {
-        return weight;
-    }
-
-    @JsonProperty("weight")
-    public void setWeight(Integer weight) {
-        this.weight = weight;
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCANAPreferredDuringSchedulingIgnoredDuringExecutionBuilder edit() {
-        return new CatalogSourceSpecGPCANAPreferredDuringSchedulingIgnoredDuringExecutionBuilder(this);
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCANAPreferredDuringSchedulingIgnoredDuringExecutionBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCANARDSIDENSTMatchExpressions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCANARDSIDENSTMatchExpressions.java
deleted file mode 100644
index ff11027f3ad..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCANARDSIDENSTMatchExpressions.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "operator",
-    "values"
-})
-@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 CatalogSourceSpecGPCANARDSIDENSTMatchExpressions implements Editable<CatalogSourceSpecGPCANARDSIDENSTMatchExpressionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("operator")
-    private String operator;
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> values = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public CatalogSourceSpecGPCANARDSIDENSTMatchExpressions() {
-    }
-
-    public CatalogSourceSpecGPCANARDSIDENSTMatchExpressions(String key, String operator, List<String> values) {
-        super();
-        this.key = key;
-        this.operator = operator;
-        this.values = values;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("operator")
-    public String getOperator() {
-        return operator;
-    }
-
-    @JsonProperty("operator")
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getValues() {
-        return values;
-    }
-
-    @JsonProperty("values")
-    public void setValues(List<String> values) {
-        this.values = values;
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCANARDSIDENSTMatchExpressionsBuilder edit() {
-        return new CatalogSourceSpecGPCANARDSIDENSTMatchExpressionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCANARDSIDENSTMatchExpressionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCANARDSIDENSTMatchFields.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCANARDSIDENSTMatchFields.java
deleted file mode 100644
index c9e0ef56a1e..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCANARDSIDENSTMatchFields.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "operator",
-    "values"
-})
-@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 CatalogSourceSpecGPCANARDSIDENSTMatchFields implements Editable<CatalogSourceSpecGPCANARDSIDENSTMatchFieldsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("operator")
-    private String operator;
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> values = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public CatalogSourceSpecGPCANARDSIDENSTMatchFields() {
-    }
-
-    public CatalogSourceSpecGPCANARDSIDENSTMatchFields(String key, String operator, List<String> values) {
-        super();
-        this.key = key;
-        this.operator = operator;
-        this.values = values;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("operator")
-    public String getOperator() {
-        return operator;
-    }
-
-    @JsonProperty("operator")
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getValues() {
-        return values;
-    }
-
-    @JsonProperty("values")
-    public void setValues(List<String> values) {
-        this.values = values;
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCANARDSIDENSTMatchFieldsBuilder edit() {
-        return new CatalogSourceSpecGPCANARDSIDENSTMatchFieldsBuilder(this);
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCANARDSIDENSTMatchFieldsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCANARDSIDENodeSelectorTerms.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCANARDSIDENodeSelectorTerms.java
deleted file mode 100644
index e2b7de59ec0..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCANARDSIDENodeSelectorTerms.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "matchExpressions",
-    "matchFields"
-})
-@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 CatalogSourceSpecGPCANARDSIDENodeSelectorTerms implements Editable<CatalogSourceSpecGPCANARDSIDENodeSelectorTermsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<CatalogSourceSpecGPCANARDSIDENSTMatchExpressions> matchExpressions = new ArrayList<>();
-    @JsonProperty("matchFields")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<CatalogSourceSpecGPCANARDSIDENSTMatchFields> matchFields = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public CatalogSourceSpecGPCANARDSIDENodeSelectorTerms() {
-    }
-
-    public CatalogSourceSpecGPCANARDSIDENodeSelectorTerms(List<CatalogSourceSpecGPCANARDSIDENSTMatchExpressions> matchExpressions, List<CatalogSourceSpecGPCANARDSIDENSTMatchFields> matchFields) {
-        super();
-        this.matchExpressions = matchExpressions;
-        this.matchFields = matchFields;
-    }
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<CatalogSourceSpecGPCANARDSIDENSTMatchExpressions> getMatchExpressions() {
-        return matchExpressions;
-    }
-
-    @JsonProperty("matchExpressions")
-    public void setMatchExpressions(List<CatalogSourceSpecGPCANARDSIDENSTMatchExpressions> matchExpressions) {
-        this.matchExpressions = matchExpressions;
-    }
-
-    @JsonProperty("matchFields")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<CatalogSourceSpecGPCANARDSIDENSTMatchFields> getMatchFields() {
-        return matchFields;
-    }
-
-    @JsonProperty("matchFields")
-    public void setMatchFields(List<CatalogSourceSpecGPCANARDSIDENSTMatchFields> matchFields) {
-        this.matchFields = matchFields;
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCANARDSIDENodeSelectorTermsBuilder edit() {
-        return new CatalogSourceSpecGPCANARDSIDENodeSelectorTermsBuilder(this);
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCANARDSIDENodeSelectorTermsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCANARequiredDuringSchedulingIgnoredDuringExecution.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCANARequiredDuringSchedulingIgnoredDuringExecution.java
deleted file mode 100644
index 672a8f25ff5..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCANARequiredDuringSchedulingIgnoredDuringExecution.java
+++ /dev/null
@@ -1,112 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "nodeSelectorTerms"
-})
-@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 CatalogSourceSpecGPCANARequiredDuringSchedulingIgnoredDuringExecution implements Editable<CatalogSourceSpecGPCANARequiredDuringSchedulingIgnoredDuringExecutionBuilder> , KubernetesResource
-{
-
-    @JsonProperty("nodeSelectorTerms")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<CatalogSourceSpecGPCANARDSIDENodeSelectorTerms> nodeSelectorTerms = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public CatalogSourceSpecGPCANARequiredDuringSchedulingIgnoredDuringExecution() {
-    }
-
-    public CatalogSourceSpecGPCANARequiredDuringSchedulingIgnoredDuringExecution(List<CatalogSourceSpecGPCANARDSIDENodeSelectorTerms> nodeSelectorTerms) {
-        super();
-        this.nodeSelectorTerms = nodeSelectorTerms;
-    }
-
-    @JsonProperty("nodeSelectorTerms")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<CatalogSourceSpecGPCANARDSIDENodeSelectorTerms> getNodeSelectorTerms() {
-        return nodeSelectorTerms;
-    }
-
-    @JsonProperty("nodeSelectorTerms")
-    public void setNodeSelectorTerms(List<CatalogSourceSpecGPCANARDSIDENodeSelectorTerms> nodeSelectorTerms) {
-        this.nodeSelectorTerms = nodeSelectorTerms;
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCANARequiredDuringSchedulingIgnoredDuringExecutionBuilder edit() {
-        return new CatalogSourceSpecGPCANARequiredDuringSchedulingIgnoredDuringExecutionBuilder(this);
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCANARequiredDuringSchedulingIgnoredDuringExecutionBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCANodeAffinity.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCANodeAffinity.java
deleted file mode 100644
index 487464d1541..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCANodeAffinity.java
+++ /dev/null
@@ -1,126 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "preferredDuringSchedulingIgnoredDuringExecution",
-    "requiredDuringSchedulingIgnoredDuringExecution"
-})
-@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 CatalogSourceSpecGPCANodeAffinity implements Editable<CatalogSourceSpecGPCANodeAffinityBuilder> , KubernetesResource
-{
-
-    @JsonProperty("preferredDuringSchedulingIgnoredDuringExecution")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<CatalogSourceSpecGPCANAPreferredDuringSchedulingIgnoredDuringExecution> preferredDuringSchedulingIgnoredDuringExecution = new ArrayList<>();
-    @JsonProperty("requiredDuringSchedulingIgnoredDuringExecution")
-    private CatalogSourceSpecGPCANARequiredDuringSchedulingIgnoredDuringExecution requiredDuringSchedulingIgnoredDuringExecution;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public CatalogSourceSpecGPCANodeAffinity() {
-    }
-
-    public CatalogSourceSpecGPCANodeAffinity(List<CatalogSourceSpecGPCANAPreferredDuringSchedulingIgnoredDuringExecution> preferredDuringSchedulingIgnoredDuringExecution, CatalogSourceSpecGPCANARequiredDuringSchedulingIgnoredDuringExecution requiredDuringSchedulingIgnoredDuringExecution) {
-        super();
-        this.preferredDuringSchedulingIgnoredDuringExecution = preferredDuringSchedulingIgnoredDuringExecution;
-        this.requiredDuringSchedulingIgnoredDuringExecution = requiredDuringSchedulingIgnoredDuringExecution;
-    }
-
-    @JsonProperty("preferredDuringSchedulingIgnoredDuringExecution")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<CatalogSourceSpecGPCANAPreferredDuringSchedulingIgnoredDuringExecution> getPreferredDuringSchedulingIgnoredDuringExecution() {
-        return preferredDuringSchedulingIgnoredDuringExecution;
-    }
-
-    @JsonProperty("preferredDuringSchedulingIgnoredDuringExecution")
-    public void setPreferredDuringSchedulingIgnoredDuringExecution(List<CatalogSourceSpecGPCANAPreferredDuringSchedulingIgnoredDuringExecution> preferredDuringSchedulingIgnoredDuringExecution) {
-        this.preferredDuringSchedulingIgnoredDuringExecution = preferredDuringSchedulingIgnoredDuringExecution;
-    }
-
-    @JsonProperty("requiredDuringSchedulingIgnoredDuringExecution")
-    public CatalogSourceSpecGPCANARequiredDuringSchedulingIgnoredDuringExecution getRequiredDuringSchedulingIgnoredDuringExecution() {
-        return requiredDuringSchedulingIgnoredDuringExecution;
-    }
-
-    @JsonProperty("requiredDuringSchedulingIgnoredDuringExecution")
-    public void setRequiredDuringSchedulingIgnoredDuringExecution(CatalogSourceSpecGPCANARequiredDuringSchedulingIgnoredDuringExecution requiredDuringSchedulingIgnoredDuringExecution) {
-        this.requiredDuringSchedulingIgnoredDuringExecution = requiredDuringSchedulingIgnoredDuringExecution;
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCANodeAffinityBuilder edit() {
-        return new CatalogSourceSpecGPCANodeAffinityBuilder(this);
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCANodeAffinityBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPAAPDSIDEPATLSMatchExpressions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPAAPDSIDEPATLSMatchExpressions.java
deleted file mode 100644
index d7c09ab259d..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPAAPDSIDEPATLSMatchExpressions.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "operator",
-    "values"
-})
-@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 CatalogSourceSpecGPCAPAAPDSIDEPATLSMatchExpressions implements Editable<CatalogSourceSpecGPCAPAAPDSIDEPATLSMatchExpressionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("operator")
-    private String operator;
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> values = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public CatalogSourceSpecGPCAPAAPDSIDEPATLSMatchExpressions() {
-    }
-
-    public CatalogSourceSpecGPCAPAAPDSIDEPATLSMatchExpressions(String key, String operator, List<String> values) {
-        super();
-        this.key = key;
-        this.operator = operator;
-        this.values = values;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("operator")
-    public String getOperator() {
-        return operator;
-    }
-
-    @JsonProperty("operator")
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getValues() {
-        return values;
-    }
-
-    @JsonProperty("values")
-    public void setValues(List<String> values) {
-        this.values = values;
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCAPAAPDSIDEPATLSMatchExpressionsBuilder edit() {
-        return new CatalogSourceSpecGPCAPAAPDSIDEPATLSMatchExpressionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCAPAAPDSIDEPATLSMatchExpressionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPAAPDSIDEPATLabelSelector.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPAAPDSIDEPATLabelSelector.java
deleted file mode 100644
index 2307b52e325..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPAAPDSIDEPATLabelSelector.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "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 CatalogSourceSpecGPCAPAAPDSIDEPATLabelSelector implements Editable<CatalogSourceSpecGPCAPAAPDSIDEPATLabelSelectorBuilder> , KubernetesResource
-{
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<CatalogSourceSpecGPCAPAAPDSIDEPATLSMatchExpressions> matchExpressions = new ArrayList<>();
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, String> matchLabels = new LinkedHashMap<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public CatalogSourceSpecGPCAPAAPDSIDEPATLabelSelector() {
-    }
-
-    public CatalogSourceSpecGPCAPAAPDSIDEPATLabelSelector(List<CatalogSourceSpecGPCAPAAPDSIDEPATLSMatchExpressions> matchExpressions, Map<String, String> matchLabels) {
-        super();
-        this.matchExpressions = matchExpressions;
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<CatalogSourceSpecGPCAPAAPDSIDEPATLSMatchExpressions> getMatchExpressions() {
-        return matchExpressions;
-    }
-
-    @JsonProperty("matchExpressions")
-    public void setMatchExpressions(List<CatalogSourceSpecGPCAPAAPDSIDEPATLSMatchExpressions> matchExpressions) {
-        this.matchExpressions = matchExpressions;
-    }
-
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, String> getMatchLabels() {
-        return matchLabels;
-    }
-
-    @JsonProperty("matchLabels")
-    public void setMatchLabels(Map<String, String> matchLabels) {
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCAPAAPDSIDEPATLabelSelectorBuilder edit() {
-        return new CatalogSourceSpecGPCAPAAPDSIDEPATLabelSelectorBuilder(this);
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCAPAAPDSIDEPATLabelSelectorBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPAAPDSIDEPATNSMatchExpressions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPAAPDSIDEPATNSMatchExpressions.java
deleted file mode 100644
index 6cb5ec3de0e..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPAAPDSIDEPATNSMatchExpressions.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "operator",
-    "values"
-})
-@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 CatalogSourceSpecGPCAPAAPDSIDEPATNSMatchExpressions implements Editable<CatalogSourceSpecGPCAPAAPDSIDEPATNSMatchExpressionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("operator")
-    private String operator;
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> values = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public CatalogSourceSpecGPCAPAAPDSIDEPATNSMatchExpressions() {
-    }
-
-    public CatalogSourceSpecGPCAPAAPDSIDEPATNSMatchExpressions(String key, String operator, List<String> values) {
-        super();
-        this.key = key;
-        this.operator = operator;
-        this.values = values;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("operator")
-    public String getOperator() {
-        return operator;
-    }
-
-    @JsonProperty("operator")
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getValues() {
-        return values;
-    }
-
-    @JsonProperty("values")
-    public void setValues(List<String> values) {
-        this.values = values;
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCAPAAPDSIDEPATNSMatchExpressionsBuilder edit() {
-        return new CatalogSourceSpecGPCAPAAPDSIDEPATNSMatchExpressionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCAPAAPDSIDEPATNSMatchExpressionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPAAPDSIDEPATNamespaceSelector.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPAAPDSIDEPATNamespaceSelector.java
deleted file mode 100644
index e33c0a8f65f..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPAAPDSIDEPATNamespaceSelector.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "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 CatalogSourceSpecGPCAPAAPDSIDEPATNamespaceSelector implements Editable<CatalogSourceSpecGPCAPAAPDSIDEPATNamespaceSelectorBuilder> , KubernetesResource
-{
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<CatalogSourceSpecGPCAPAAPDSIDEPATNSMatchExpressions> matchExpressions = new ArrayList<>();
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, String> matchLabels = new LinkedHashMap<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public CatalogSourceSpecGPCAPAAPDSIDEPATNamespaceSelector() {
-    }
-
-    public CatalogSourceSpecGPCAPAAPDSIDEPATNamespaceSelector(List<CatalogSourceSpecGPCAPAAPDSIDEPATNSMatchExpressions> matchExpressions, Map<String, String> matchLabels) {
-        super();
-        this.matchExpressions = matchExpressions;
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<CatalogSourceSpecGPCAPAAPDSIDEPATNSMatchExpressions> getMatchExpressions() {
-        return matchExpressions;
-    }
-
-    @JsonProperty("matchExpressions")
-    public void setMatchExpressions(List<CatalogSourceSpecGPCAPAAPDSIDEPATNSMatchExpressions> matchExpressions) {
-        this.matchExpressions = matchExpressions;
-    }
-
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, String> getMatchLabels() {
-        return matchLabels;
-    }
-
-    @JsonProperty("matchLabels")
-    public void setMatchLabels(Map<String, String> matchLabels) {
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCAPAAPDSIDEPATNamespaceSelectorBuilder edit() {
-        return new CatalogSourceSpecGPCAPAAPDSIDEPATNamespaceSelectorBuilder(this);
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCAPAAPDSIDEPATNamespaceSelectorBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPAAPDSIDEPodAffinityTerm.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPAAPDSIDEPodAffinityTerm.java
deleted file mode 100644
index d721a2fe2a3..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPAAPDSIDEPodAffinityTerm.java
+++ /dev/null
@@ -1,186 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "labelSelector",
-    "matchLabelKeys",
-    "mismatchLabelKeys",
-    "namespaceSelector",
-    "namespaces",
-    "topologyKey"
-})
-@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 CatalogSourceSpecGPCAPAAPDSIDEPodAffinityTerm implements Editable<CatalogSourceSpecGPCAPAAPDSIDEPodAffinityTermBuilder> , KubernetesResource
-{
-
-    @JsonProperty("labelSelector")
-    private CatalogSourceSpecGPCAPAAPDSIDEPATLabelSelector labelSelector;
-    @JsonProperty("matchLabelKeys")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> matchLabelKeys = new ArrayList<>();
-    @JsonProperty("mismatchLabelKeys")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> mismatchLabelKeys = new ArrayList<>();
-    @JsonProperty("namespaceSelector")
-    private CatalogSourceSpecGPCAPAAPDSIDEPATNamespaceSelector namespaceSelector;
-    @JsonProperty("namespaces")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> namespaces = new ArrayList<>();
-    @JsonProperty("topologyKey")
-    private String topologyKey;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public CatalogSourceSpecGPCAPAAPDSIDEPodAffinityTerm() {
-    }
-
-    public CatalogSourceSpecGPCAPAAPDSIDEPodAffinityTerm(CatalogSourceSpecGPCAPAAPDSIDEPATLabelSelector labelSelector, List<String> matchLabelKeys, List<String> mismatchLabelKeys, CatalogSourceSpecGPCAPAAPDSIDEPATNamespaceSelector namespaceSelector, List<String> namespaces, String topologyKey) {
-        super();
-        this.labelSelector = labelSelector;
-        this.matchLabelKeys = matchLabelKeys;
-        this.mismatchLabelKeys = mismatchLabelKeys;
-        this.namespaceSelector = namespaceSelector;
-        this.namespaces = namespaces;
-        this.topologyKey = topologyKey;
-    }
-
-    @JsonProperty("labelSelector")
-    public CatalogSourceSpecGPCAPAAPDSIDEPATLabelSelector getLabelSelector() {
-        return labelSelector;
-    }
-
-    @JsonProperty("labelSelector")
-    public void setLabelSelector(CatalogSourceSpecGPCAPAAPDSIDEPATLabelSelector labelSelector) {
-        this.labelSelector = labelSelector;
-    }
-
-    @JsonProperty("matchLabelKeys")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getMatchLabelKeys() {
-        return matchLabelKeys;
-    }
-
-    @JsonProperty("matchLabelKeys")
-    public void setMatchLabelKeys(List<String> matchLabelKeys) {
-        this.matchLabelKeys = matchLabelKeys;
-    }
-
-    @JsonProperty("mismatchLabelKeys")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getMismatchLabelKeys() {
-        return mismatchLabelKeys;
-    }
-
-    @JsonProperty("mismatchLabelKeys")
-    public void setMismatchLabelKeys(List<String> mismatchLabelKeys) {
-        this.mismatchLabelKeys = mismatchLabelKeys;
-    }
-
-    @JsonProperty("namespaceSelector")
-    public CatalogSourceSpecGPCAPAAPDSIDEPATNamespaceSelector getNamespaceSelector() {
-        return namespaceSelector;
-    }
-
-    @JsonProperty("namespaceSelector")
-    public void setNamespaceSelector(CatalogSourceSpecGPCAPAAPDSIDEPATNamespaceSelector namespaceSelector) {
-        this.namespaceSelector = namespaceSelector;
-    }
-
-    @JsonProperty("namespaces")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getNamespaces() {
-        return namespaces;
-    }
-
-    @JsonProperty("namespaces")
-    public void setNamespaces(List<String> namespaces) {
-        this.namespaces = namespaces;
-    }
-
-    @JsonProperty("topologyKey")
-    public String getTopologyKey() {
-        return topologyKey;
-    }
-
-    @JsonProperty("topologyKey")
-    public void setTopologyKey(String topologyKey) {
-        this.topologyKey = topologyKey;
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCAPAAPDSIDEPodAffinityTermBuilder edit() {
-        return new CatalogSourceSpecGPCAPAAPDSIDEPodAffinityTermBuilder(this);
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCAPAAPDSIDEPodAffinityTermBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPAAPreferredDuringSchedulingIgnoredDuringExecution.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPAAPreferredDuringSchedulingIgnoredDuringExecution.java
deleted file mode 100644
index c97915947f5..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPAAPreferredDuringSchedulingIgnoredDuringExecution.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "podAffinityTerm",
-    "weight"
-})
-@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 CatalogSourceSpecGPCAPAAPreferredDuringSchedulingIgnoredDuringExecution implements Editable<CatalogSourceSpecGPCAPAAPreferredDuringSchedulingIgnoredDuringExecutionBuilder> , KubernetesResource
-{
-
-    @JsonProperty("podAffinityTerm")
-    private CatalogSourceSpecGPCAPAAPDSIDEPodAffinityTerm podAffinityTerm;
-    @JsonProperty("weight")
-    private Integer weight;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public CatalogSourceSpecGPCAPAAPreferredDuringSchedulingIgnoredDuringExecution() {
-    }
-
-    public CatalogSourceSpecGPCAPAAPreferredDuringSchedulingIgnoredDuringExecution(CatalogSourceSpecGPCAPAAPDSIDEPodAffinityTerm podAffinityTerm, Integer weight) {
-        super();
-        this.podAffinityTerm = podAffinityTerm;
-        this.weight = weight;
-    }
-
-    @JsonProperty("podAffinityTerm")
-    public CatalogSourceSpecGPCAPAAPDSIDEPodAffinityTerm getPodAffinityTerm() {
-        return podAffinityTerm;
-    }
-
-    @JsonProperty("podAffinityTerm")
-    public void setPodAffinityTerm(CatalogSourceSpecGPCAPAAPDSIDEPodAffinityTerm podAffinityTerm) {
-        this.podAffinityTerm = podAffinityTerm;
-    }
-
-    @JsonProperty("weight")
-    public Integer getWeight() {
-        return weight;
-    }
-
-    @JsonProperty("weight")
-    public void setWeight(Integer weight) {
-        this.weight = weight;
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCAPAAPreferredDuringSchedulingIgnoredDuringExecutionBuilder edit() {
-        return new CatalogSourceSpecGPCAPAAPreferredDuringSchedulingIgnoredDuringExecutionBuilder(this);
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCAPAAPreferredDuringSchedulingIgnoredDuringExecutionBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPAARDSIDELSMatchExpressions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPAARDSIDELSMatchExpressions.java
deleted file mode 100644
index 507fca8f33b..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPAARDSIDELSMatchExpressions.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "operator",
-    "values"
-})
-@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 CatalogSourceSpecGPCAPAARDSIDELSMatchExpressions implements Editable<CatalogSourceSpecGPCAPAARDSIDELSMatchExpressionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("operator")
-    private String operator;
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> values = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public CatalogSourceSpecGPCAPAARDSIDELSMatchExpressions() {
-    }
-
-    public CatalogSourceSpecGPCAPAARDSIDELSMatchExpressions(String key, String operator, List<String> values) {
-        super();
-        this.key = key;
-        this.operator = operator;
-        this.values = values;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("operator")
-    public String getOperator() {
-        return operator;
-    }
-
-    @JsonProperty("operator")
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getValues() {
-        return values;
-    }
-
-    @JsonProperty("values")
-    public void setValues(List<String> values) {
-        this.values = values;
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCAPAARDSIDELSMatchExpressionsBuilder edit() {
-        return new CatalogSourceSpecGPCAPAARDSIDELSMatchExpressionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCAPAARDSIDELSMatchExpressionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPAARDSIDELabelSelector.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPAARDSIDELabelSelector.java
deleted file mode 100644
index 10d56adb2ab..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPAARDSIDELabelSelector.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "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 CatalogSourceSpecGPCAPAARDSIDELabelSelector implements Editable<CatalogSourceSpecGPCAPAARDSIDELabelSelectorBuilder> , KubernetesResource
-{
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<CatalogSourceSpecGPCAPAARDSIDELSMatchExpressions> matchExpressions = new ArrayList<>();
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, String> matchLabels = new LinkedHashMap<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public CatalogSourceSpecGPCAPAARDSIDELabelSelector() {
-    }
-
-    public CatalogSourceSpecGPCAPAARDSIDELabelSelector(List<CatalogSourceSpecGPCAPAARDSIDELSMatchExpressions> matchExpressions, Map<String, String> matchLabels) {
-        super();
-        this.matchExpressions = matchExpressions;
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<CatalogSourceSpecGPCAPAARDSIDELSMatchExpressions> getMatchExpressions() {
-        return matchExpressions;
-    }
-
-    @JsonProperty("matchExpressions")
-    public void setMatchExpressions(List<CatalogSourceSpecGPCAPAARDSIDELSMatchExpressions> matchExpressions) {
-        this.matchExpressions = matchExpressions;
-    }
-
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, String> getMatchLabels() {
-        return matchLabels;
-    }
-
-    @JsonProperty("matchLabels")
-    public void setMatchLabels(Map<String, String> matchLabels) {
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCAPAARDSIDELabelSelectorBuilder edit() {
-        return new CatalogSourceSpecGPCAPAARDSIDELabelSelectorBuilder(this);
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCAPAARDSIDELabelSelectorBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPAARDSIDENSMatchExpressions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPAARDSIDENSMatchExpressions.java
deleted file mode 100644
index 5fc1afe2b7e..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPAARDSIDENSMatchExpressions.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "operator",
-    "values"
-})
-@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 CatalogSourceSpecGPCAPAARDSIDENSMatchExpressions implements Editable<CatalogSourceSpecGPCAPAARDSIDENSMatchExpressionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("operator")
-    private String operator;
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> values = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public CatalogSourceSpecGPCAPAARDSIDENSMatchExpressions() {
-    }
-
-    public CatalogSourceSpecGPCAPAARDSIDENSMatchExpressions(String key, String operator, List<String> values) {
-        super();
-        this.key = key;
-        this.operator = operator;
-        this.values = values;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("operator")
-    public String getOperator() {
-        return operator;
-    }
-
-    @JsonProperty("operator")
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getValues() {
-        return values;
-    }
-
-    @JsonProperty("values")
-    public void setValues(List<String> values) {
-        this.values = values;
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCAPAARDSIDENSMatchExpressionsBuilder edit() {
-        return new CatalogSourceSpecGPCAPAARDSIDENSMatchExpressionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCAPAARDSIDENSMatchExpressionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPAARDSIDENamespaceSelector.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPAARDSIDENamespaceSelector.java
deleted file mode 100644
index 3c19be0c22d..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPAARDSIDENamespaceSelector.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "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 CatalogSourceSpecGPCAPAARDSIDENamespaceSelector implements Editable<CatalogSourceSpecGPCAPAARDSIDENamespaceSelectorBuilder> , KubernetesResource
-{
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<CatalogSourceSpecGPCAPAARDSIDENSMatchExpressions> matchExpressions = new ArrayList<>();
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, String> matchLabels = new LinkedHashMap<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public CatalogSourceSpecGPCAPAARDSIDENamespaceSelector() {
-    }
-
-    public CatalogSourceSpecGPCAPAARDSIDENamespaceSelector(List<CatalogSourceSpecGPCAPAARDSIDENSMatchExpressions> matchExpressions, Map<String, String> matchLabels) {
-        super();
-        this.matchExpressions = matchExpressions;
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<CatalogSourceSpecGPCAPAARDSIDENSMatchExpressions> getMatchExpressions() {
-        return matchExpressions;
-    }
-
-    @JsonProperty("matchExpressions")
-    public void setMatchExpressions(List<CatalogSourceSpecGPCAPAARDSIDENSMatchExpressions> matchExpressions) {
-        this.matchExpressions = matchExpressions;
-    }
-
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, String> getMatchLabels() {
-        return matchLabels;
-    }
-
-    @JsonProperty("matchLabels")
-    public void setMatchLabels(Map<String, String> matchLabels) {
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCAPAARDSIDENamespaceSelectorBuilder edit() {
-        return new CatalogSourceSpecGPCAPAARDSIDENamespaceSelectorBuilder(this);
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCAPAARDSIDENamespaceSelectorBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPAARequiredDuringSchedulingIgnoredDuringExecution.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPAARequiredDuringSchedulingIgnoredDuringExecution.java
deleted file mode 100644
index 0a7528980de..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPAARequiredDuringSchedulingIgnoredDuringExecution.java
+++ /dev/null
@@ -1,186 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "labelSelector",
-    "matchLabelKeys",
-    "mismatchLabelKeys",
-    "namespaceSelector",
-    "namespaces",
-    "topologyKey"
-})
-@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 CatalogSourceSpecGPCAPAARequiredDuringSchedulingIgnoredDuringExecution implements Editable<CatalogSourceSpecGPCAPAARequiredDuringSchedulingIgnoredDuringExecutionBuilder> , KubernetesResource
-{
-
-    @JsonProperty("labelSelector")
-    private CatalogSourceSpecGPCAPAARDSIDELabelSelector labelSelector;
-    @JsonProperty("matchLabelKeys")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> matchLabelKeys = new ArrayList<>();
-    @JsonProperty("mismatchLabelKeys")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> mismatchLabelKeys = new ArrayList<>();
-    @JsonProperty("namespaceSelector")
-    private CatalogSourceSpecGPCAPAARDSIDENamespaceSelector namespaceSelector;
-    @JsonProperty("namespaces")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> namespaces = new ArrayList<>();
-    @JsonProperty("topologyKey")
-    private String topologyKey;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public CatalogSourceSpecGPCAPAARequiredDuringSchedulingIgnoredDuringExecution() {
-    }
-
-    public CatalogSourceSpecGPCAPAARequiredDuringSchedulingIgnoredDuringExecution(CatalogSourceSpecGPCAPAARDSIDELabelSelector labelSelector, List<String> matchLabelKeys, List<String> mismatchLabelKeys, CatalogSourceSpecGPCAPAARDSIDENamespaceSelector namespaceSelector, List<String> namespaces, String topologyKey) {
-        super();
-        this.labelSelector = labelSelector;
-        this.matchLabelKeys = matchLabelKeys;
-        this.mismatchLabelKeys = mismatchLabelKeys;
-        this.namespaceSelector = namespaceSelector;
-        this.namespaces = namespaces;
-        this.topologyKey = topologyKey;
-    }
-
-    @JsonProperty("labelSelector")
-    public CatalogSourceSpecGPCAPAARDSIDELabelSelector getLabelSelector() {
-        return labelSelector;
-    }
-
-    @JsonProperty("labelSelector")
-    public void setLabelSelector(CatalogSourceSpecGPCAPAARDSIDELabelSelector labelSelector) {
-        this.labelSelector = labelSelector;
-    }
-
-    @JsonProperty("matchLabelKeys")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getMatchLabelKeys() {
-        return matchLabelKeys;
-    }
-
-    @JsonProperty("matchLabelKeys")
-    public void setMatchLabelKeys(List<String> matchLabelKeys) {
-        this.matchLabelKeys = matchLabelKeys;
-    }
-
-    @JsonProperty("mismatchLabelKeys")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getMismatchLabelKeys() {
-        return mismatchLabelKeys;
-    }
-
-    @JsonProperty("mismatchLabelKeys")
-    public void setMismatchLabelKeys(List<String> mismatchLabelKeys) {
-        this.mismatchLabelKeys = mismatchLabelKeys;
-    }
-
-    @JsonProperty("namespaceSelector")
-    public CatalogSourceSpecGPCAPAARDSIDENamespaceSelector getNamespaceSelector() {
-        return namespaceSelector;
-    }
-
-    @JsonProperty("namespaceSelector")
-    public void setNamespaceSelector(CatalogSourceSpecGPCAPAARDSIDENamespaceSelector namespaceSelector) {
-        this.namespaceSelector = namespaceSelector;
-    }
-
-    @JsonProperty("namespaces")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getNamespaces() {
-        return namespaces;
-    }
-
-    @JsonProperty("namespaces")
-    public void setNamespaces(List<String> namespaces) {
-        this.namespaces = namespaces;
-    }
-
-    @JsonProperty("topologyKey")
-    public String getTopologyKey() {
-        return topologyKey;
-    }
-
-    @JsonProperty("topologyKey")
-    public void setTopologyKey(String topologyKey) {
-        this.topologyKey = topologyKey;
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCAPAARequiredDuringSchedulingIgnoredDuringExecutionBuilder edit() {
-        return new CatalogSourceSpecGPCAPAARequiredDuringSchedulingIgnoredDuringExecutionBuilder(this);
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCAPAARequiredDuringSchedulingIgnoredDuringExecutionBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPAPDSIDEPATLSMatchExpressions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPAPDSIDEPATLSMatchExpressions.java
deleted file mode 100644
index 42a5c780826..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPAPDSIDEPATLSMatchExpressions.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "operator",
-    "values"
-})
-@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 CatalogSourceSpecGPCAPAPDSIDEPATLSMatchExpressions implements Editable<CatalogSourceSpecGPCAPAPDSIDEPATLSMatchExpressionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("operator")
-    private String operator;
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> values = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public CatalogSourceSpecGPCAPAPDSIDEPATLSMatchExpressions() {
-    }
-
-    public CatalogSourceSpecGPCAPAPDSIDEPATLSMatchExpressions(String key, String operator, List<String> values) {
-        super();
-        this.key = key;
-        this.operator = operator;
-        this.values = values;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("operator")
-    public String getOperator() {
-        return operator;
-    }
-
-    @JsonProperty("operator")
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getValues() {
-        return values;
-    }
-
-    @JsonProperty("values")
-    public void setValues(List<String> values) {
-        this.values = values;
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCAPAPDSIDEPATLSMatchExpressionsBuilder edit() {
-        return new CatalogSourceSpecGPCAPAPDSIDEPATLSMatchExpressionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCAPAPDSIDEPATLSMatchExpressionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPAPDSIDEPATLabelSelector.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPAPDSIDEPATLabelSelector.java
deleted file mode 100644
index 23e4d3be690..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPAPDSIDEPATLabelSelector.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "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 CatalogSourceSpecGPCAPAPDSIDEPATLabelSelector implements Editable<CatalogSourceSpecGPCAPAPDSIDEPATLabelSelectorBuilder> , KubernetesResource
-{
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<CatalogSourceSpecGPCAPAPDSIDEPATLSMatchExpressions> matchExpressions = new ArrayList<>();
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, String> matchLabels = new LinkedHashMap<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public CatalogSourceSpecGPCAPAPDSIDEPATLabelSelector() {
-    }
-
-    public CatalogSourceSpecGPCAPAPDSIDEPATLabelSelector(List<CatalogSourceSpecGPCAPAPDSIDEPATLSMatchExpressions> matchExpressions, Map<String, String> matchLabels) {
-        super();
-        this.matchExpressions = matchExpressions;
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<CatalogSourceSpecGPCAPAPDSIDEPATLSMatchExpressions> getMatchExpressions() {
-        return matchExpressions;
-    }
-
-    @JsonProperty("matchExpressions")
-    public void setMatchExpressions(List<CatalogSourceSpecGPCAPAPDSIDEPATLSMatchExpressions> matchExpressions) {
-        this.matchExpressions = matchExpressions;
-    }
-
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, String> getMatchLabels() {
-        return matchLabels;
-    }
-
-    @JsonProperty("matchLabels")
-    public void setMatchLabels(Map<String, String> matchLabels) {
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCAPAPDSIDEPATLabelSelectorBuilder edit() {
-        return new CatalogSourceSpecGPCAPAPDSIDEPATLabelSelectorBuilder(this);
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCAPAPDSIDEPATLabelSelectorBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPAPDSIDEPATNSMatchExpressions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPAPDSIDEPATNSMatchExpressions.java
deleted file mode 100644
index 16363abc22f..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPAPDSIDEPATNSMatchExpressions.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "operator",
-    "values"
-})
-@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 CatalogSourceSpecGPCAPAPDSIDEPATNSMatchExpressions implements Editable<CatalogSourceSpecGPCAPAPDSIDEPATNSMatchExpressionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("operator")
-    private String operator;
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> values = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public CatalogSourceSpecGPCAPAPDSIDEPATNSMatchExpressions() {
-    }
-
-    public CatalogSourceSpecGPCAPAPDSIDEPATNSMatchExpressions(String key, String operator, List<String> values) {
-        super();
-        this.key = key;
-        this.operator = operator;
-        this.values = values;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("operator")
-    public String getOperator() {
-        return operator;
-    }
-
-    @JsonProperty("operator")
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getValues() {
-        return values;
-    }
-
-    @JsonProperty("values")
-    public void setValues(List<String> values) {
-        this.values = values;
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCAPAPDSIDEPATNSMatchExpressionsBuilder edit() {
-        return new CatalogSourceSpecGPCAPAPDSIDEPATNSMatchExpressionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCAPAPDSIDEPATNSMatchExpressionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPAPDSIDEPATNamespaceSelector.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPAPDSIDEPATNamespaceSelector.java
deleted file mode 100644
index 7c129e85124..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPAPDSIDEPATNamespaceSelector.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "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 CatalogSourceSpecGPCAPAPDSIDEPATNamespaceSelector implements Editable<CatalogSourceSpecGPCAPAPDSIDEPATNamespaceSelectorBuilder> , KubernetesResource
-{
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<CatalogSourceSpecGPCAPAPDSIDEPATNSMatchExpressions> matchExpressions = new ArrayList<>();
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, String> matchLabels = new LinkedHashMap<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public CatalogSourceSpecGPCAPAPDSIDEPATNamespaceSelector() {
-    }
-
-    public CatalogSourceSpecGPCAPAPDSIDEPATNamespaceSelector(List<CatalogSourceSpecGPCAPAPDSIDEPATNSMatchExpressions> matchExpressions, Map<String, String> matchLabels) {
-        super();
-        this.matchExpressions = matchExpressions;
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<CatalogSourceSpecGPCAPAPDSIDEPATNSMatchExpressions> getMatchExpressions() {
-        return matchExpressions;
-    }
-
-    @JsonProperty("matchExpressions")
-    public void setMatchExpressions(List<CatalogSourceSpecGPCAPAPDSIDEPATNSMatchExpressions> matchExpressions) {
-        this.matchExpressions = matchExpressions;
-    }
-
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, String> getMatchLabels() {
-        return matchLabels;
-    }
-
-    @JsonProperty("matchLabels")
-    public void setMatchLabels(Map<String, String> matchLabels) {
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCAPAPDSIDEPATNamespaceSelectorBuilder edit() {
-        return new CatalogSourceSpecGPCAPAPDSIDEPATNamespaceSelectorBuilder(this);
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCAPAPDSIDEPATNamespaceSelectorBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPAPDSIDEPodAffinityTerm.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPAPDSIDEPodAffinityTerm.java
deleted file mode 100644
index a5d6b3338d9..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPAPDSIDEPodAffinityTerm.java
+++ /dev/null
@@ -1,186 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "labelSelector",
-    "matchLabelKeys",
-    "mismatchLabelKeys",
-    "namespaceSelector",
-    "namespaces",
-    "topologyKey"
-})
-@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 CatalogSourceSpecGPCAPAPDSIDEPodAffinityTerm implements Editable<CatalogSourceSpecGPCAPAPDSIDEPodAffinityTermBuilder> , KubernetesResource
-{
-
-    @JsonProperty("labelSelector")
-    private CatalogSourceSpecGPCAPAPDSIDEPATLabelSelector labelSelector;
-    @JsonProperty("matchLabelKeys")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> matchLabelKeys = new ArrayList<>();
-    @JsonProperty("mismatchLabelKeys")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> mismatchLabelKeys = new ArrayList<>();
-    @JsonProperty("namespaceSelector")
-    private CatalogSourceSpecGPCAPAPDSIDEPATNamespaceSelector namespaceSelector;
-    @JsonProperty("namespaces")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> namespaces = new ArrayList<>();
-    @JsonProperty("topologyKey")
-    private String topologyKey;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public CatalogSourceSpecGPCAPAPDSIDEPodAffinityTerm() {
-    }
-
-    public CatalogSourceSpecGPCAPAPDSIDEPodAffinityTerm(CatalogSourceSpecGPCAPAPDSIDEPATLabelSelector labelSelector, List<String> matchLabelKeys, List<String> mismatchLabelKeys, CatalogSourceSpecGPCAPAPDSIDEPATNamespaceSelector namespaceSelector, List<String> namespaces, String topologyKey) {
-        super();
-        this.labelSelector = labelSelector;
-        this.matchLabelKeys = matchLabelKeys;
-        this.mismatchLabelKeys = mismatchLabelKeys;
-        this.namespaceSelector = namespaceSelector;
-        this.namespaces = namespaces;
-        this.topologyKey = topologyKey;
-    }
-
-    @JsonProperty("labelSelector")
-    public CatalogSourceSpecGPCAPAPDSIDEPATLabelSelector getLabelSelector() {
-        return labelSelector;
-    }
-
-    @JsonProperty("labelSelector")
-    public void setLabelSelector(CatalogSourceSpecGPCAPAPDSIDEPATLabelSelector labelSelector) {
-        this.labelSelector = labelSelector;
-    }
-
-    @JsonProperty("matchLabelKeys")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getMatchLabelKeys() {
-        return matchLabelKeys;
-    }
-
-    @JsonProperty("matchLabelKeys")
-    public void setMatchLabelKeys(List<String> matchLabelKeys) {
-        this.matchLabelKeys = matchLabelKeys;
-    }
-
-    @JsonProperty("mismatchLabelKeys")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getMismatchLabelKeys() {
-        return mismatchLabelKeys;
-    }
-
-    @JsonProperty("mismatchLabelKeys")
-    public void setMismatchLabelKeys(List<String> mismatchLabelKeys) {
-        this.mismatchLabelKeys = mismatchLabelKeys;
-    }
-
-    @JsonProperty("namespaceSelector")
-    public CatalogSourceSpecGPCAPAPDSIDEPATNamespaceSelector getNamespaceSelector() {
-        return namespaceSelector;
-    }
-
-    @JsonProperty("namespaceSelector")
-    public void setNamespaceSelector(CatalogSourceSpecGPCAPAPDSIDEPATNamespaceSelector namespaceSelector) {
-        this.namespaceSelector = namespaceSelector;
-    }
-
-    @JsonProperty("namespaces")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getNamespaces() {
-        return namespaces;
-    }
-
-    @JsonProperty("namespaces")
-    public void setNamespaces(List<String> namespaces) {
-        this.namespaces = namespaces;
-    }
-
-    @JsonProperty("topologyKey")
-    public String getTopologyKey() {
-        return topologyKey;
-    }
-
-    @JsonProperty("topologyKey")
-    public void setTopologyKey(String topologyKey) {
-        this.topologyKey = topologyKey;
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCAPAPDSIDEPodAffinityTermBuilder edit() {
-        return new CatalogSourceSpecGPCAPAPDSIDEPodAffinityTermBuilder(this);
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCAPAPDSIDEPodAffinityTermBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPAPreferredDuringSchedulingIgnoredDuringExecution.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPAPreferredDuringSchedulingIgnoredDuringExecution.java
deleted file mode 100644
index 0222e725829..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPAPreferredDuringSchedulingIgnoredDuringExecution.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "podAffinityTerm",
-    "weight"
-})
-@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 CatalogSourceSpecGPCAPAPreferredDuringSchedulingIgnoredDuringExecution implements Editable<CatalogSourceSpecGPCAPAPreferredDuringSchedulingIgnoredDuringExecutionBuilder> , KubernetesResource
-{
-
-    @JsonProperty("podAffinityTerm")
-    private CatalogSourceSpecGPCAPAPDSIDEPodAffinityTerm podAffinityTerm;
-    @JsonProperty("weight")
-    private Integer weight;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public CatalogSourceSpecGPCAPAPreferredDuringSchedulingIgnoredDuringExecution() {
-    }
-
-    public CatalogSourceSpecGPCAPAPreferredDuringSchedulingIgnoredDuringExecution(CatalogSourceSpecGPCAPAPDSIDEPodAffinityTerm podAffinityTerm, Integer weight) {
-        super();
-        this.podAffinityTerm = podAffinityTerm;
-        this.weight = weight;
-    }
-
-    @JsonProperty("podAffinityTerm")
-    public CatalogSourceSpecGPCAPAPDSIDEPodAffinityTerm getPodAffinityTerm() {
-        return podAffinityTerm;
-    }
-
-    @JsonProperty("podAffinityTerm")
-    public void setPodAffinityTerm(CatalogSourceSpecGPCAPAPDSIDEPodAffinityTerm podAffinityTerm) {
-        this.podAffinityTerm = podAffinityTerm;
-    }
-
-    @JsonProperty("weight")
-    public Integer getWeight() {
-        return weight;
-    }
-
-    @JsonProperty("weight")
-    public void setWeight(Integer weight) {
-        this.weight = weight;
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCAPAPreferredDuringSchedulingIgnoredDuringExecutionBuilder edit() {
-        return new CatalogSourceSpecGPCAPAPreferredDuringSchedulingIgnoredDuringExecutionBuilder(this);
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCAPAPreferredDuringSchedulingIgnoredDuringExecutionBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPARDSIDELSMatchExpressions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPARDSIDELSMatchExpressions.java
deleted file mode 100644
index bd4f5629755..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPARDSIDELSMatchExpressions.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "operator",
-    "values"
-})
-@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 CatalogSourceSpecGPCAPARDSIDELSMatchExpressions implements Editable<CatalogSourceSpecGPCAPARDSIDELSMatchExpressionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("operator")
-    private String operator;
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> values = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public CatalogSourceSpecGPCAPARDSIDELSMatchExpressions() {
-    }
-
-    public CatalogSourceSpecGPCAPARDSIDELSMatchExpressions(String key, String operator, List<String> values) {
-        super();
-        this.key = key;
-        this.operator = operator;
-        this.values = values;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("operator")
-    public String getOperator() {
-        return operator;
-    }
-
-    @JsonProperty("operator")
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getValues() {
-        return values;
-    }
-
-    @JsonProperty("values")
-    public void setValues(List<String> values) {
-        this.values = values;
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCAPARDSIDELSMatchExpressionsBuilder edit() {
-        return new CatalogSourceSpecGPCAPARDSIDELSMatchExpressionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCAPARDSIDELSMatchExpressionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPARDSIDELabelSelector.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPARDSIDELabelSelector.java
deleted file mode 100644
index 06913e9829f..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPARDSIDELabelSelector.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "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 CatalogSourceSpecGPCAPARDSIDELabelSelector implements Editable<CatalogSourceSpecGPCAPARDSIDELabelSelectorBuilder> , KubernetesResource
-{
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<CatalogSourceSpecGPCAPARDSIDELSMatchExpressions> matchExpressions = new ArrayList<>();
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, String> matchLabels = new LinkedHashMap<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public CatalogSourceSpecGPCAPARDSIDELabelSelector() {
-    }
-
-    public CatalogSourceSpecGPCAPARDSIDELabelSelector(List<CatalogSourceSpecGPCAPARDSIDELSMatchExpressions> matchExpressions, Map<String, String> matchLabels) {
-        super();
-        this.matchExpressions = matchExpressions;
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<CatalogSourceSpecGPCAPARDSIDELSMatchExpressions> getMatchExpressions() {
-        return matchExpressions;
-    }
-
-    @JsonProperty("matchExpressions")
-    public void setMatchExpressions(List<CatalogSourceSpecGPCAPARDSIDELSMatchExpressions> matchExpressions) {
-        this.matchExpressions = matchExpressions;
-    }
-
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, String> getMatchLabels() {
-        return matchLabels;
-    }
-
-    @JsonProperty("matchLabels")
-    public void setMatchLabels(Map<String, String> matchLabels) {
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCAPARDSIDELabelSelectorBuilder edit() {
-        return new CatalogSourceSpecGPCAPARDSIDELabelSelectorBuilder(this);
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCAPARDSIDELabelSelectorBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPARDSIDENSMatchExpressions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPARDSIDENSMatchExpressions.java
deleted file mode 100644
index 9fd49d74712..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPARDSIDENSMatchExpressions.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "operator",
-    "values"
-})
-@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 CatalogSourceSpecGPCAPARDSIDENSMatchExpressions implements Editable<CatalogSourceSpecGPCAPARDSIDENSMatchExpressionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("operator")
-    private String operator;
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> values = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public CatalogSourceSpecGPCAPARDSIDENSMatchExpressions() {
-    }
-
-    public CatalogSourceSpecGPCAPARDSIDENSMatchExpressions(String key, String operator, List<String> values) {
-        super();
-        this.key = key;
-        this.operator = operator;
-        this.values = values;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("operator")
-    public String getOperator() {
-        return operator;
-    }
-
-    @JsonProperty("operator")
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getValues() {
-        return values;
-    }
-
-    @JsonProperty("values")
-    public void setValues(List<String> values) {
-        this.values = values;
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCAPARDSIDENSMatchExpressionsBuilder edit() {
-        return new CatalogSourceSpecGPCAPARDSIDENSMatchExpressionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCAPARDSIDENSMatchExpressionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPARDSIDENamespaceSelector.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPARDSIDENamespaceSelector.java
deleted file mode 100644
index 30b927d7804..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPARDSIDENamespaceSelector.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "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 CatalogSourceSpecGPCAPARDSIDENamespaceSelector implements Editable<CatalogSourceSpecGPCAPARDSIDENamespaceSelectorBuilder> , KubernetesResource
-{
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<CatalogSourceSpecGPCAPARDSIDENSMatchExpressions> matchExpressions = new ArrayList<>();
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, String> matchLabels = new LinkedHashMap<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public CatalogSourceSpecGPCAPARDSIDENamespaceSelector() {
-    }
-
-    public CatalogSourceSpecGPCAPARDSIDENamespaceSelector(List<CatalogSourceSpecGPCAPARDSIDENSMatchExpressions> matchExpressions, Map<String, String> matchLabels) {
-        super();
-        this.matchExpressions = matchExpressions;
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<CatalogSourceSpecGPCAPARDSIDENSMatchExpressions> getMatchExpressions() {
-        return matchExpressions;
-    }
-
-    @JsonProperty("matchExpressions")
-    public void setMatchExpressions(List<CatalogSourceSpecGPCAPARDSIDENSMatchExpressions> matchExpressions) {
-        this.matchExpressions = matchExpressions;
-    }
-
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, String> getMatchLabels() {
-        return matchLabels;
-    }
-
-    @JsonProperty("matchLabels")
-    public void setMatchLabels(Map<String, String> matchLabels) {
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCAPARDSIDENamespaceSelectorBuilder edit() {
-        return new CatalogSourceSpecGPCAPARDSIDENamespaceSelectorBuilder(this);
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCAPARDSIDENamespaceSelectorBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPARequiredDuringSchedulingIgnoredDuringExecution.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPARequiredDuringSchedulingIgnoredDuringExecution.java
deleted file mode 100644
index ce83e00e715..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPARequiredDuringSchedulingIgnoredDuringExecution.java
+++ /dev/null
@@ -1,186 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "labelSelector",
-    "matchLabelKeys",
-    "mismatchLabelKeys",
-    "namespaceSelector",
-    "namespaces",
-    "topologyKey"
-})
-@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 CatalogSourceSpecGPCAPARequiredDuringSchedulingIgnoredDuringExecution implements Editable<CatalogSourceSpecGPCAPARequiredDuringSchedulingIgnoredDuringExecutionBuilder> , KubernetesResource
-{
-
-    @JsonProperty("labelSelector")
-    private CatalogSourceSpecGPCAPARDSIDELabelSelector labelSelector;
-    @JsonProperty("matchLabelKeys")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> matchLabelKeys = new ArrayList<>();
-    @JsonProperty("mismatchLabelKeys")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> mismatchLabelKeys = new ArrayList<>();
-    @JsonProperty("namespaceSelector")
-    private CatalogSourceSpecGPCAPARDSIDENamespaceSelector namespaceSelector;
-    @JsonProperty("namespaces")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> namespaces = new ArrayList<>();
-    @JsonProperty("topologyKey")
-    private String topologyKey;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public CatalogSourceSpecGPCAPARequiredDuringSchedulingIgnoredDuringExecution() {
-    }
-
-    public CatalogSourceSpecGPCAPARequiredDuringSchedulingIgnoredDuringExecution(CatalogSourceSpecGPCAPARDSIDELabelSelector labelSelector, List<String> matchLabelKeys, List<String> mismatchLabelKeys, CatalogSourceSpecGPCAPARDSIDENamespaceSelector namespaceSelector, List<String> namespaces, String topologyKey) {
-        super();
-        this.labelSelector = labelSelector;
-        this.matchLabelKeys = matchLabelKeys;
-        this.mismatchLabelKeys = mismatchLabelKeys;
-        this.namespaceSelector = namespaceSelector;
-        this.namespaces = namespaces;
-        this.topologyKey = topologyKey;
-    }
-
-    @JsonProperty("labelSelector")
-    public CatalogSourceSpecGPCAPARDSIDELabelSelector getLabelSelector() {
-        return labelSelector;
-    }
-
-    @JsonProperty("labelSelector")
-    public void setLabelSelector(CatalogSourceSpecGPCAPARDSIDELabelSelector labelSelector) {
-        this.labelSelector = labelSelector;
-    }
-
-    @JsonProperty("matchLabelKeys")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getMatchLabelKeys() {
-        return matchLabelKeys;
-    }
-
-    @JsonProperty("matchLabelKeys")
-    public void setMatchLabelKeys(List<String> matchLabelKeys) {
-        this.matchLabelKeys = matchLabelKeys;
-    }
-
-    @JsonProperty("mismatchLabelKeys")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getMismatchLabelKeys() {
-        return mismatchLabelKeys;
-    }
-
-    @JsonProperty("mismatchLabelKeys")
-    public void setMismatchLabelKeys(List<String> mismatchLabelKeys) {
-        this.mismatchLabelKeys = mismatchLabelKeys;
-    }
-
-    @JsonProperty("namespaceSelector")
-    public CatalogSourceSpecGPCAPARDSIDENamespaceSelector getNamespaceSelector() {
-        return namespaceSelector;
-    }
-
-    @JsonProperty("namespaceSelector")
-    public void setNamespaceSelector(CatalogSourceSpecGPCAPARDSIDENamespaceSelector namespaceSelector) {
-        this.namespaceSelector = namespaceSelector;
-    }
-
-    @JsonProperty("namespaces")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getNamespaces() {
-        return namespaces;
-    }
-
-    @JsonProperty("namespaces")
-    public void setNamespaces(List<String> namespaces) {
-        this.namespaces = namespaces;
-    }
-
-    @JsonProperty("topologyKey")
-    public String getTopologyKey() {
-        return topologyKey;
-    }
-
-    @JsonProperty("topologyKey")
-    public void setTopologyKey(String topologyKey) {
-        this.topologyKey = topologyKey;
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCAPARequiredDuringSchedulingIgnoredDuringExecutionBuilder edit() {
-        return new CatalogSourceSpecGPCAPARequiredDuringSchedulingIgnoredDuringExecutionBuilder(this);
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCAPARequiredDuringSchedulingIgnoredDuringExecutionBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPodAffinity.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPodAffinity.java
deleted file mode 100644
index 0a8c3b05e10..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPodAffinity.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "preferredDuringSchedulingIgnoredDuringExecution",
-    "requiredDuringSchedulingIgnoredDuringExecution"
-})
-@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 CatalogSourceSpecGPCAPodAffinity implements Editable<CatalogSourceSpecGPCAPodAffinityBuilder> , KubernetesResource
-{
-
-    @JsonProperty("preferredDuringSchedulingIgnoredDuringExecution")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<CatalogSourceSpecGPCAPAPreferredDuringSchedulingIgnoredDuringExecution> preferredDuringSchedulingIgnoredDuringExecution = new ArrayList<>();
-    @JsonProperty("requiredDuringSchedulingIgnoredDuringExecution")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<CatalogSourceSpecGPCAPARequiredDuringSchedulingIgnoredDuringExecution> requiredDuringSchedulingIgnoredDuringExecution = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public CatalogSourceSpecGPCAPodAffinity() {
-    }
-
-    public CatalogSourceSpecGPCAPodAffinity(List<CatalogSourceSpecGPCAPAPreferredDuringSchedulingIgnoredDuringExecution> preferredDuringSchedulingIgnoredDuringExecution, List<CatalogSourceSpecGPCAPARequiredDuringSchedulingIgnoredDuringExecution> requiredDuringSchedulingIgnoredDuringExecution) {
-        super();
-        this.preferredDuringSchedulingIgnoredDuringExecution = preferredDuringSchedulingIgnoredDuringExecution;
-        this.requiredDuringSchedulingIgnoredDuringExecution = requiredDuringSchedulingIgnoredDuringExecution;
-    }
-
-    @JsonProperty("preferredDuringSchedulingIgnoredDuringExecution")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<CatalogSourceSpecGPCAPAPreferredDuringSchedulingIgnoredDuringExecution> getPreferredDuringSchedulingIgnoredDuringExecution() {
-        return preferredDuringSchedulingIgnoredDuringExecution;
-    }
-
-    @JsonProperty("preferredDuringSchedulingIgnoredDuringExecution")
-    public void setPreferredDuringSchedulingIgnoredDuringExecution(List<CatalogSourceSpecGPCAPAPreferredDuringSchedulingIgnoredDuringExecution> preferredDuringSchedulingIgnoredDuringExecution) {
-        this.preferredDuringSchedulingIgnoredDuringExecution = preferredDuringSchedulingIgnoredDuringExecution;
-    }
-
-    @JsonProperty("requiredDuringSchedulingIgnoredDuringExecution")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<CatalogSourceSpecGPCAPARequiredDuringSchedulingIgnoredDuringExecution> getRequiredDuringSchedulingIgnoredDuringExecution() {
-        return requiredDuringSchedulingIgnoredDuringExecution;
-    }
-
-    @JsonProperty("requiredDuringSchedulingIgnoredDuringExecution")
-    public void setRequiredDuringSchedulingIgnoredDuringExecution(List<CatalogSourceSpecGPCAPARequiredDuringSchedulingIgnoredDuringExecution> requiredDuringSchedulingIgnoredDuringExecution) {
-        this.requiredDuringSchedulingIgnoredDuringExecution = requiredDuringSchedulingIgnoredDuringExecution;
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCAPodAffinityBuilder edit() {
-        return new CatalogSourceSpecGPCAPodAffinityBuilder(this);
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCAPodAffinityBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPodAntiAffinity.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPodAntiAffinity.java
deleted file mode 100644
index a7d3496ed85..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAPodAntiAffinity.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "preferredDuringSchedulingIgnoredDuringExecution",
-    "requiredDuringSchedulingIgnoredDuringExecution"
-})
-@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 CatalogSourceSpecGPCAPodAntiAffinity implements Editable<CatalogSourceSpecGPCAPodAntiAffinityBuilder> , KubernetesResource
-{
-
-    @JsonProperty("preferredDuringSchedulingIgnoredDuringExecution")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<CatalogSourceSpecGPCAPAAPreferredDuringSchedulingIgnoredDuringExecution> preferredDuringSchedulingIgnoredDuringExecution = new ArrayList<>();
-    @JsonProperty("requiredDuringSchedulingIgnoredDuringExecution")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<CatalogSourceSpecGPCAPAARequiredDuringSchedulingIgnoredDuringExecution> requiredDuringSchedulingIgnoredDuringExecution = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public CatalogSourceSpecGPCAPodAntiAffinity() {
-    }
-
-    public CatalogSourceSpecGPCAPodAntiAffinity(List<CatalogSourceSpecGPCAPAAPreferredDuringSchedulingIgnoredDuringExecution> preferredDuringSchedulingIgnoredDuringExecution, List<CatalogSourceSpecGPCAPAARequiredDuringSchedulingIgnoredDuringExecution> requiredDuringSchedulingIgnoredDuringExecution) {
-        super();
-        this.preferredDuringSchedulingIgnoredDuringExecution = preferredDuringSchedulingIgnoredDuringExecution;
-        this.requiredDuringSchedulingIgnoredDuringExecution = requiredDuringSchedulingIgnoredDuringExecution;
-    }
-
-    @JsonProperty("preferredDuringSchedulingIgnoredDuringExecution")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<CatalogSourceSpecGPCAPAAPreferredDuringSchedulingIgnoredDuringExecution> getPreferredDuringSchedulingIgnoredDuringExecution() {
-        return preferredDuringSchedulingIgnoredDuringExecution;
-    }
-
-    @JsonProperty("preferredDuringSchedulingIgnoredDuringExecution")
-    public void setPreferredDuringSchedulingIgnoredDuringExecution(List<CatalogSourceSpecGPCAPAAPreferredDuringSchedulingIgnoredDuringExecution> preferredDuringSchedulingIgnoredDuringExecution) {
-        this.preferredDuringSchedulingIgnoredDuringExecution = preferredDuringSchedulingIgnoredDuringExecution;
-    }
-
-    @JsonProperty("requiredDuringSchedulingIgnoredDuringExecution")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<CatalogSourceSpecGPCAPAARequiredDuringSchedulingIgnoredDuringExecution> getRequiredDuringSchedulingIgnoredDuringExecution() {
-        return requiredDuringSchedulingIgnoredDuringExecution;
-    }
-
-    @JsonProperty("requiredDuringSchedulingIgnoredDuringExecution")
-    public void setRequiredDuringSchedulingIgnoredDuringExecution(List<CatalogSourceSpecGPCAPAARequiredDuringSchedulingIgnoredDuringExecution> requiredDuringSchedulingIgnoredDuringExecution) {
-        this.requiredDuringSchedulingIgnoredDuringExecution = requiredDuringSchedulingIgnoredDuringExecution;
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCAPodAntiAffinityBuilder edit() {
-        return new CatalogSourceSpecGPCAPodAntiAffinityBuilder(this);
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCAPodAntiAffinityBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAffinity.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAffinity.java
deleted file mode 100644
index 8c87398b6b3..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCAffinity.java
+++ /dev/null
@@ -1,136 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "nodeAffinity",
-    "podAffinity",
-    "podAntiAffinity"
-})
-@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 CatalogSourceSpecGPCAffinity implements Editable<CatalogSourceSpecGPCAffinityBuilder> , KubernetesResource
-{
-
-    @JsonProperty("nodeAffinity")
-    private CatalogSourceSpecGPCANodeAffinity nodeAffinity;
-    @JsonProperty("podAffinity")
-    private CatalogSourceSpecGPCAPodAffinity podAffinity;
-    @JsonProperty("podAntiAffinity")
-    private CatalogSourceSpecGPCAPodAntiAffinity podAntiAffinity;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public CatalogSourceSpecGPCAffinity() {
-    }
-
-    public CatalogSourceSpecGPCAffinity(CatalogSourceSpecGPCANodeAffinity nodeAffinity, CatalogSourceSpecGPCAPodAffinity podAffinity, CatalogSourceSpecGPCAPodAntiAffinity podAntiAffinity) {
-        super();
-        this.nodeAffinity = nodeAffinity;
-        this.podAffinity = podAffinity;
-        this.podAntiAffinity = podAntiAffinity;
-    }
-
-    @JsonProperty("nodeAffinity")
-    public CatalogSourceSpecGPCANodeAffinity getNodeAffinity() {
-        return nodeAffinity;
-    }
-
-    @JsonProperty("nodeAffinity")
-    public void setNodeAffinity(CatalogSourceSpecGPCANodeAffinity nodeAffinity) {
-        this.nodeAffinity = nodeAffinity;
-    }
-
-    @JsonProperty("podAffinity")
-    public CatalogSourceSpecGPCAPodAffinity getPodAffinity() {
-        return podAffinity;
-    }
-
-    @JsonProperty("podAffinity")
-    public void setPodAffinity(CatalogSourceSpecGPCAPodAffinity podAffinity) {
-        this.podAffinity = podAffinity;
-    }
-
-    @JsonProperty("podAntiAffinity")
-    public CatalogSourceSpecGPCAPodAntiAffinity getPodAntiAffinity() {
-        return podAntiAffinity;
-    }
-
-    @JsonProperty("podAntiAffinity")
-    public void setPodAntiAffinity(CatalogSourceSpecGPCAPodAntiAffinity podAntiAffinity) {
-        this.podAntiAffinity = podAntiAffinity;
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCAffinityBuilder edit() {
-        return new CatalogSourceSpecGPCAffinityBuilder(this);
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCAffinityBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCTolerations.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCTolerations.java
deleted file mode 100644
index 76fc73fe45f..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCTolerations.java
+++ /dev/null
@@ -1,164 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "effect",
-    "key",
-    "operator",
-    "tolerationSeconds",
-    "value"
-})
-@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 CatalogSourceSpecGPCTolerations implements Editable<CatalogSourceSpecGPCTolerationsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("effect")
-    private String effect;
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("operator")
-    private String operator;
-    @JsonProperty("tolerationSeconds")
-    private Long tolerationSeconds;
-    @JsonProperty("value")
-    private String value;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public CatalogSourceSpecGPCTolerations() {
-    }
-
-    public CatalogSourceSpecGPCTolerations(String effect, String key, String operator, Long tolerationSeconds, String value) {
-        super();
-        this.effect = effect;
-        this.key = key;
-        this.operator = operator;
-        this.tolerationSeconds = tolerationSeconds;
-        this.value = value;
-    }
-
-    @JsonProperty("effect")
-    public String getEffect() {
-        return effect;
-    }
-
-    @JsonProperty("effect")
-    public void setEffect(String effect) {
-        this.effect = effect;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("operator")
-    public String getOperator() {
-        return operator;
-    }
-
-    @JsonProperty("operator")
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    @JsonProperty("tolerationSeconds")
-    public Long getTolerationSeconds() {
-        return tolerationSeconds;
-    }
-
-    @JsonProperty("tolerationSeconds")
-    public void setTolerationSeconds(Long tolerationSeconds) {
-        this.tolerationSeconds = tolerationSeconds;
-    }
-
-    @JsonProperty("value")
-    public String getValue() {
-        return value;
-    }
-
-    @JsonProperty("value")
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCTolerationsBuilder edit() {
-        return new CatalogSourceSpecGPCTolerationsBuilder(this);
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecGPCTolerationsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecIcon.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecIcon.java
deleted file mode 100644
index 0da2e331f90..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecIcon.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "base64data",
-    "mediatype"
-})
-@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 CatalogSourceSpecIcon implements Editable<CatalogSourceSpecIconBuilder> , KubernetesResource
-{
-
-    @JsonProperty("base64data")
-    private String base64data;
-    @JsonProperty("mediatype")
-    private String mediatype;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public CatalogSourceSpecIcon() {
-    }
-
-    public CatalogSourceSpecIcon(String base64data, String mediatype) {
-        super();
-        this.base64data = base64data;
-        this.mediatype = mediatype;
-    }
-
-    @JsonProperty("base64data")
-    public String getBase64data() {
-        return base64data;
-    }
-
-    @JsonProperty("base64data")
-    public void setBase64data(String base64data) {
-        this.base64data = base64data;
-    }
-
-    @JsonProperty("mediatype")
-    public String getMediatype() {
-        return mediatype;
-    }
-
-    @JsonProperty("mediatype")
-    public void setMediatype(String mediatype) {
-        this.mediatype = mediatype;
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecIconBuilder edit() {
-        return new CatalogSourceSpecIconBuilder(this);
-    }
-
-    @JsonIgnore
-    public CatalogSourceSpecIconBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceStatus.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceStatus.java
index 5a4a705f0bd..6b8208e9a4c 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceStatus.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceStatus.java
@@ -14,6 +14,7 @@
 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.Condition;
 import io.fabric8.kubernetes.api.model.Container;
 import io.fabric8.kubernetes.api.model.IntOrString;
 import io.fabric8.kubernetes.api.model.KubernetesResource;
@@ -64,11 +65,11 @@ public class CatalogSourceStatus implements Editable<CatalogSourceStatusBuilder>
 
     @JsonProperty("conditions")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<CatalogSourceStatusConditions> conditions = new ArrayList<>();
+    private List<Condition> conditions = new ArrayList<>();
     @JsonProperty("configMapReference")
-    private CatalogSourceStatusConfigMapReference configMapReference;
+    private ConfigMapResourceReference configMapReference;
     @JsonProperty("connectionState")
-    private CatalogSourceStatusConnectionState connectionState;
+    private GRPCConnectionState connectionState;
     @JsonProperty("latestImageRegistryPoll")
     private String latestImageRegistryPoll;
     @JsonProperty("message")
@@ -76,7 +77,7 @@ public class CatalogSourceStatus implements Editable<CatalogSourceStatusBuilder>
     @JsonProperty("reason")
     private String reason;
     @JsonProperty("registryService")
-    private CatalogSourceStatusRegistryService registryService;
+    private RegistryServiceStatus registryService;
     @JsonIgnore
     private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
 
@@ -87,7 +88,7 @@ public class CatalogSourceStatus implements Editable<CatalogSourceStatusBuilder>
     public CatalogSourceStatus() {
     }
 
-    public CatalogSourceStatus(List<CatalogSourceStatusConditions> conditions, CatalogSourceStatusConfigMapReference configMapReference, CatalogSourceStatusConnectionState connectionState, String latestImageRegistryPoll, String message, String reason, CatalogSourceStatusRegistryService registryService) {
+    public CatalogSourceStatus(List<Condition> conditions, ConfigMapResourceReference configMapReference, GRPCConnectionState connectionState, String latestImageRegistryPoll, String message, String reason, RegistryServiceStatus registryService) {
         super();
         this.conditions = conditions;
         this.configMapReference = configMapReference;
@@ -100,32 +101,32 @@ public CatalogSourceStatus(List<CatalogSourceStatusConditions> conditions, Catal
 
     @JsonProperty("conditions")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<CatalogSourceStatusConditions> getConditions() {
+    public List<Condition> getConditions() {
         return conditions;
     }
 
     @JsonProperty("conditions")
-    public void setConditions(List<CatalogSourceStatusConditions> conditions) {
+    public void setConditions(List<Condition> conditions) {
         this.conditions = conditions;
     }
 
     @JsonProperty("configMapReference")
-    public CatalogSourceStatusConfigMapReference getConfigMapReference() {
+    public ConfigMapResourceReference getConfigMapReference() {
         return configMapReference;
     }
 
     @JsonProperty("configMapReference")
-    public void setConfigMapReference(CatalogSourceStatusConfigMapReference configMapReference) {
+    public void setConfigMapReference(ConfigMapResourceReference configMapReference) {
         this.configMapReference = configMapReference;
     }
 
     @JsonProperty("connectionState")
-    public CatalogSourceStatusConnectionState getConnectionState() {
+    public GRPCConnectionState getConnectionState() {
         return connectionState;
     }
 
     @JsonProperty("connectionState")
-    public void setConnectionState(CatalogSourceStatusConnectionState connectionState) {
+    public void setConnectionState(GRPCConnectionState connectionState) {
         this.connectionState = connectionState;
     }
 
@@ -160,12 +161,12 @@ public void setReason(String reason) {
     }
 
     @JsonProperty("registryService")
-    public CatalogSourceStatusRegistryService getRegistryService() {
+    public RegistryServiceStatus getRegistryService() {
         return registryService;
     }
 
     @JsonProperty("registryService")
-    public void setRegistryService(CatalogSourceStatusRegistryService registryService) {
+    public void setRegistryService(RegistryServiceStatus registryService) {
         this.registryService = registryService;
     }
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceStatusConditions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceStatusConditions.java
deleted file mode 100644
index 28214895d48..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceStatusConditions.java
+++ /dev/null
@@ -1,178 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "lastTransitionTime",
-    "message",
-    "observedGeneration",
-    "reason",
-    "status",
-    "type"
-})
-@ToString
-@EqualsAndHashCode
-@Accessors(prefix = {
-    "_",
-    ""
-})
-@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
-    @BuildableReference(ObjectMeta.class),
-    @BuildableReference(LabelSelector.class),
-    @BuildableReference(Container.class),
-    @BuildableReference(PodTemplateSpec.class),
-    @BuildableReference(ResourceRequirements.class),
-    @BuildableReference(IntOrString.class),
-    @BuildableReference(ObjectReference.class),
-    @BuildableReference(LocalObjectReference.class),
-    @BuildableReference(PersistentVolumeClaim.class)
-})
-@Generated("jsonschema2pojo")
-public class CatalogSourceStatusConditions implements Editable<CatalogSourceStatusConditionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("lastTransitionTime")
-    private String lastTransitionTime;
-    @JsonProperty("message")
-    private String message;
-    @JsonProperty("observedGeneration")
-    private Long observedGeneration;
-    @JsonProperty("reason")
-    private String reason;
-    @JsonProperty("status")
-    private String status;
-    @JsonProperty("type")
-    private String type;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public CatalogSourceStatusConditions() {
-    }
-
-    public CatalogSourceStatusConditions(String lastTransitionTime, String message, Long observedGeneration, String reason, String status, String type) {
-        super();
-        this.lastTransitionTime = lastTransitionTime;
-        this.message = message;
-        this.observedGeneration = observedGeneration;
-        this.reason = reason;
-        this.status = status;
-        this.type = type;
-    }
-
-    @JsonProperty("lastTransitionTime")
-    public String getLastTransitionTime() {
-        return lastTransitionTime;
-    }
-
-    @JsonProperty("lastTransitionTime")
-    public void setLastTransitionTime(String lastTransitionTime) {
-        this.lastTransitionTime = lastTransitionTime;
-    }
-
-    @JsonProperty("message")
-    public String getMessage() {
-        return message;
-    }
-
-    @JsonProperty("message")
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    @JsonProperty("observedGeneration")
-    public Long getObservedGeneration() {
-        return observedGeneration;
-    }
-
-    @JsonProperty("observedGeneration")
-    public void setObservedGeneration(Long observedGeneration) {
-        this.observedGeneration = observedGeneration;
-    }
-
-    @JsonProperty("reason")
-    public String getReason() {
-        return reason;
-    }
-
-    @JsonProperty("reason")
-    public void setReason(String reason) {
-        this.reason = reason;
-    }
-
-    @JsonProperty("status")
-    public String getStatus() {
-        return status;
-    }
-
-    @JsonProperty("status")
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    @JsonProperty("type")
-    public String getType() {
-        return type;
-    }
-
-    @JsonProperty("type")
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    @JsonIgnore
-    public CatalogSourceStatusConditionsBuilder edit() {
-        return new CatalogSourceStatusConditionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public CatalogSourceStatusConditionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecCleanup.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CleanupSpec.java
similarity index 88%
rename from kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecCleanup.java
rename to kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CleanupSpec.java
index 6f4dca6422d..ed4ccfdf77f 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecCleanup.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CleanupSpec.java
@@ -51,7 +51,7 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class ClusterServiceVersionSpecCleanup implements Editable<ClusterServiceVersionSpecCleanupBuilder> , KubernetesResource
+public class CleanupSpec implements Editable<CleanupSpecBuilder> , KubernetesResource
 {
 
     @JsonProperty("enabled")
@@ -63,10 +63,10 @@ public class ClusterServiceVersionSpecCleanup implements Editable<ClusterService
      * No args constructor for use in serialization
      * 
      */
-    public ClusterServiceVersionSpecCleanup() {
+    public CleanupSpec() {
     }
 
-    public ClusterServiceVersionSpecCleanup(Boolean enabled) {
+    public CleanupSpec(Boolean enabled) {
         super();
         this.enabled = enabled;
     }
@@ -82,12 +82,12 @@ public void setEnabled(Boolean enabled) {
     }
 
     @JsonIgnore
-    public ClusterServiceVersionSpecCleanupBuilder edit() {
-        return new ClusterServiceVersionSpecCleanupBuilder(this);
+    public CleanupSpecBuilder edit() {
+        return new CleanupSpecBuilder(this);
     }
 
     @JsonIgnore
-    public ClusterServiceVersionSpecCleanupBuilder toBuilder() {
+    public CleanupSpecBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionStatusCleanup.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CleanupStatus.java
similarity index 81%
rename from kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionStatusCleanup.java
rename to kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CleanupStatus.java
index dc84cf5966b..2a6506b7395 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionStatusCleanup.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CleanupStatus.java
@@ -53,12 +53,12 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class ClusterServiceVersionStatusCleanup implements Editable<ClusterServiceVersionStatusCleanupBuilder> , KubernetesResource
+public class CleanupStatus implements Editable<CleanupStatusBuilder> , KubernetesResource
 {
 
     @JsonProperty("pendingDeletion")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionStatusCPendingDeletion> pendingDeletion = new ArrayList<>();
+    private List<ResourceList> pendingDeletion = new ArrayList<>();
     @JsonIgnore
     private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
 
@@ -66,32 +66,32 @@ public class ClusterServiceVersionStatusCleanup implements Editable<ClusterServi
      * No args constructor for use in serialization
      * 
      */
-    public ClusterServiceVersionStatusCleanup() {
+    public CleanupStatus() {
     }
 
-    public ClusterServiceVersionStatusCleanup(List<ClusterServiceVersionStatusCPendingDeletion> pendingDeletion) {
+    public CleanupStatus(List<ResourceList> pendingDeletion) {
         super();
         this.pendingDeletion = pendingDeletion;
     }
 
     @JsonProperty("pendingDeletion")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionStatusCPendingDeletion> getPendingDeletion() {
+    public List<ResourceList> getPendingDeletion() {
         return pendingDeletion;
     }
 
     @JsonProperty("pendingDeletion")
-    public void setPendingDeletion(List<ClusterServiceVersionStatusCPendingDeletion> pendingDeletion) {
+    public void setPendingDeletion(List<ResourceList> pendingDeletion) {
         this.pendingDeletion = pendingDeletion;
     }
 
     @JsonIgnore
-    public ClusterServiceVersionStatusCleanupBuilder edit() {
-        return new ClusterServiceVersionStatusCleanupBuilder(this);
+    public CleanupStatusBuilder edit() {
+        return new CleanupStatusBuilder(this);
     }
 
     @JsonIgnore
-    public ClusterServiceVersionStatusCleanupBuilder toBuilder() {
+    public CleanupStatusBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionStatusConditions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionCondition.java
similarity index 89%
rename from kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionStatusConditions.java
rename to kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionCondition.java
index dd0055bb12c..b981f9616a2 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionStatusConditions.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionCondition.java
@@ -55,7 +55,7 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class ClusterServiceVersionStatusConditions implements Editable<ClusterServiceVersionStatusConditionsBuilder> , KubernetesResource
+public class ClusterServiceVersionCondition implements Editable<ClusterServiceVersionConditionBuilder> , KubernetesResource
 {
 
     @JsonProperty("lastTransitionTime")
@@ -75,10 +75,10 @@ public class ClusterServiceVersionStatusConditions implements Editable<ClusterSe
      * No args constructor for use in serialization
      * 
      */
-    public ClusterServiceVersionStatusConditions() {
+    public ClusterServiceVersionCondition() {
     }
 
-    public ClusterServiceVersionStatusConditions(String lastTransitionTime, String lastUpdateTime, String message, String phase, String reason) {
+    public ClusterServiceVersionCondition(String lastTransitionTime, String lastUpdateTime, String message, String phase, String reason) {
         super();
         this.lastTransitionTime = lastTransitionTime;
         this.lastUpdateTime = lastUpdateTime;
@@ -138,12 +138,12 @@ public void setReason(String reason) {
     }
 
     @JsonIgnore
-    public ClusterServiceVersionStatusConditionsBuilder edit() {
-        return new ClusterServiceVersionStatusConditionsBuilder(this);
+    public ClusterServiceVersionConditionBuilder edit() {
+        return new ClusterServiceVersionConditionBuilder(this);
     }
 
     @JsonIgnore
-    public ClusterServiceVersionStatusConditionsBuilder toBuilder() {
+    public ClusterServiceVersionConditionBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpec.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpec.java
index 83d1c5b25d5..af2b22bb93a 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpec.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpec.java
@@ -15,6 +15,7 @@
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import io.fabric8.kubernetes.api.builder.Editable;
 import io.fabric8.kubernetes.api.model.Container;
+import io.fabric8.kubernetes.api.model.GroupVersionKind;
 import io.fabric8.kubernetes.api.model.IntOrString;
 import io.fabric8.kubernetes.api.model.KubernetesResource;
 import io.fabric8.kubernetes.api.model.LabelSelector;
@@ -82,23 +83,23 @@ public class ClusterServiceVersionSpec implements Editable<ClusterServiceVersion
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private Map<String, String> annotations = new LinkedHashMap<>();
     @JsonProperty("apiservicedefinitions")
-    private ClusterServiceVersionSpecApiservicedefinitions apiservicedefinitions;
+    private APIServiceDefinitions apiservicedefinitions;
     @JsonProperty("cleanup")
-    private ClusterServiceVersionSpecCleanup cleanup;
+    private CleanupSpec cleanup;
     @JsonProperty("customresourcedefinitions")
-    private ClusterServiceVersionSpecCustomresourcedefinitions customresourcedefinitions;
+    private CustomResourceDefinitions customresourcedefinitions;
     @JsonProperty("description")
     private String description;
     @JsonProperty("displayName")
     private String displayName;
     @JsonProperty("icon")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecIcon> icon = new ArrayList<>();
+    private List<Icon> icon = new ArrayList<>();
     @JsonProperty("install")
-    private ClusterServiceVersionSpecInstall install;
+    private NamedInstallStrategy install;
     @JsonProperty("installModes")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecInstallModes> installModes = new ArrayList<>();
+    private List<InstallMode> installModes = new ArrayList<>();
     @JsonProperty("keywords")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private List<String> keywords = new ArrayList<>();
@@ -107,26 +108,26 @@ public class ClusterServiceVersionSpec implements Editable<ClusterServiceVersion
     private Map<String, String> labels = new LinkedHashMap<>();
     @JsonProperty("links")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecLinks> links = new ArrayList<>();
+    private List<AppLink> links = new ArrayList<>();
     @JsonProperty("maintainers")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecMaintainers> maintainers = new ArrayList<>();
+    private List<Maintainer> maintainers = new ArrayList<>();
     @JsonProperty("maturity")
     private String maturity;
     @JsonProperty("minKubeVersion")
     private String minKubeVersion;
     @JsonProperty("nativeAPIs")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecNativeAPIs> nativeAPIs = new ArrayList<>();
+    private List<GroupVersionKind> nativeAPIs = new ArrayList<>();
     @JsonProperty("provider")
-    private ClusterServiceVersionSpecProvider provider;
+    private AppLink provider;
     @JsonProperty("relatedImages")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecRelatedImages> relatedImages = new ArrayList<>();
+    private List<RelatedImage> relatedImages = new ArrayList<>();
     @JsonProperty("replaces")
     private String replaces;
     @JsonProperty("selector")
-    private ClusterServiceVersionSpecSelector selector;
+    private LabelSelector selector;
     @JsonProperty("skips")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private List<String> skips = new ArrayList<>();
@@ -134,7 +135,7 @@ public class ClusterServiceVersionSpec implements Editable<ClusterServiceVersion
     private String version;
     @JsonProperty("webhookdefinitions")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecWebhookdefinitions> webhookdefinitions = new ArrayList<>();
+    private List<WebhookDescription> webhookdefinitions = new ArrayList<>();
     @JsonIgnore
     private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
 
@@ -145,7 +146,7 @@ public class ClusterServiceVersionSpec implements Editable<ClusterServiceVersion
     public ClusterServiceVersionSpec() {
     }
 
-    public ClusterServiceVersionSpec(Map<String, String> annotations, ClusterServiceVersionSpecApiservicedefinitions apiservicedefinitions, ClusterServiceVersionSpecCleanup cleanup, ClusterServiceVersionSpecCustomresourcedefinitions customresourcedefinitions, String description, String displayName, List<ClusterServiceVersionSpecIcon> icon, ClusterServiceVersionSpecInstall install, List<ClusterServiceVersionSpecInstallModes> installModes, List<String> keywords, Map<String, String> labels, List<ClusterServiceVersionSpecLinks> links, List<ClusterServiceVersionSpecMaintainers> maintainers, String maturity, String minKubeVersion, List<ClusterServiceVersionSpecNativeAPIs> nativeAPIs, ClusterServiceVersionSpecProvider provider, List<ClusterServiceVersionSpecRelatedImages> relatedImages, String replaces, ClusterServiceVersionSpecSelector selector, List<String> skips, String version, List<ClusterServiceVersionSpecWebhookdefinitions> webhookdefinitions) {
+    public ClusterServiceVersionSpec(Map<String, String> annotations, APIServiceDefinitions apiservicedefinitions, CleanupSpec cleanup, CustomResourceDefinitions customresourcedefinitions, String description, String displayName, List<Icon> icon, NamedInstallStrategy install, List<InstallMode> installModes, List<String> keywords, Map<String, String> labels, List<AppLink> links, List<Maintainer> maintainers, String maturity, String minKubeVersion, List<GroupVersionKind> nativeAPIs, AppLink provider, List<RelatedImage> relatedImages, String replaces, LabelSelector selector, List<String> skips, String version, List<WebhookDescription> webhookdefinitions) {
         super();
         this.annotations = annotations;
         this.apiservicedefinitions = apiservicedefinitions;
@@ -184,32 +185,32 @@ public void setAnnotations(Map<String, String> annotations) {
     }
 
     @JsonProperty("apiservicedefinitions")
-    public ClusterServiceVersionSpecApiservicedefinitions getApiservicedefinitions() {
+    public APIServiceDefinitions getApiservicedefinitions() {
         return apiservicedefinitions;
     }
 
     @JsonProperty("apiservicedefinitions")
-    public void setApiservicedefinitions(ClusterServiceVersionSpecApiservicedefinitions apiservicedefinitions) {
+    public void setApiservicedefinitions(APIServiceDefinitions apiservicedefinitions) {
         this.apiservicedefinitions = apiservicedefinitions;
     }
 
     @JsonProperty("cleanup")
-    public ClusterServiceVersionSpecCleanup getCleanup() {
+    public CleanupSpec getCleanup() {
         return cleanup;
     }
 
     @JsonProperty("cleanup")
-    public void setCleanup(ClusterServiceVersionSpecCleanup cleanup) {
+    public void setCleanup(CleanupSpec cleanup) {
         this.cleanup = cleanup;
     }
 
     @JsonProperty("customresourcedefinitions")
-    public ClusterServiceVersionSpecCustomresourcedefinitions getCustomresourcedefinitions() {
+    public CustomResourceDefinitions getCustomresourcedefinitions() {
         return customresourcedefinitions;
     }
 
     @JsonProperty("customresourcedefinitions")
-    public void setCustomresourcedefinitions(ClusterServiceVersionSpecCustomresourcedefinitions customresourcedefinitions) {
+    public void setCustomresourcedefinitions(CustomResourceDefinitions customresourcedefinitions) {
         this.customresourcedefinitions = customresourcedefinitions;
     }
 
@@ -235,33 +236,33 @@ public void setDisplayName(String displayName) {
 
     @JsonProperty("icon")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecIcon> getIcon() {
+    public List<Icon> getIcon() {
         return icon;
     }
 
     @JsonProperty("icon")
-    public void setIcon(List<ClusterServiceVersionSpecIcon> icon) {
+    public void setIcon(List<Icon> icon) {
         this.icon = icon;
     }
 
     @JsonProperty("install")
-    public ClusterServiceVersionSpecInstall getInstall() {
+    public NamedInstallStrategy getInstall() {
         return install;
     }
 
     @JsonProperty("install")
-    public void setInstall(ClusterServiceVersionSpecInstall install) {
+    public void setInstall(NamedInstallStrategy install) {
         this.install = install;
     }
 
     @JsonProperty("installModes")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecInstallModes> getInstallModes() {
+    public List<InstallMode> getInstallModes() {
         return installModes;
     }
 
     @JsonProperty("installModes")
-    public void setInstallModes(List<ClusterServiceVersionSpecInstallModes> installModes) {
+    public void setInstallModes(List<InstallMode> installModes) {
         this.installModes = installModes;
     }
 
@@ -289,23 +290,23 @@ public void setLabels(Map<String, String> labels) {
 
     @JsonProperty("links")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecLinks> getLinks() {
+    public List<AppLink> getLinks() {
         return links;
     }
 
     @JsonProperty("links")
-    public void setLinks(List<ClusterServiceVersionSpecLinks> links) {
+    public void setLinks(List<AppLink> links) {
         this.links = links;
     }
 
     @JsonProperty("maintainers")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecMaintainers> getMaintainers() {
+    public List<Maintainer> getMaintainers() {
         return maintainers;
     }
 
     @JsonProperty("maintainers")
-    public void setMaintainers(List<ClusterServiceVersionSpecMaintainers> maintainers) {
+    public void setMaintainers(List<Maintainer> maintainers) {
         this.maintainers = maintainers;
     }
 
@@ -331,33 +332,33 @@ public void setMinKubeVersion(String minKubeVersion) {
 
     @JsonProperty("nativeAPIs")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecNativeAPIs> getNativeAPIs() {
+    public List<GroupVersionKind> getNativeAPIs() {
         return nativeAPIs;
     }
 
     @JsonProperty("nativeAPIs")
-    public void setNativeAPIs(List<ClusterServiceVersionSpecNativeAPIs> nativeAPIs) {
+    public void setNativeAPIs(List<GroupVersionKind> nativeAPIs) {
         this.nativeAPIs = nativeAPIs;
     }
 
     @JsonProperty("provider")
-    public ClusterServiceVersionSpecProvider getProvider() {
+    public AppLink getProvider() {
         return provider;
     }
 
     @JsonProperty("provider")
-    public void setProvider(ClusterServiceVersionSpecProvider provider) {
+    public void setProvider(AppLink provider) {
         this.provider = provider;
     }
 
     @JsonProperty("relatedImages")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecRelatedImages> getRelatedImages() {
+    public List<RelatedImage> getRelatedImages() {
         return relatedImages;
     }
 
     @JsonProperty("relatedImages")
-    public void setRelatedImages(List<ClusterServiceVersionSpecRelatedImages> relatedImages) {
+    public void setRelatedImages(List<RelatedImage> relatedImages) {
         this.relatedImages = relatedImages;
     }
 
@@ -372,12 +373,12 @@ public void setReplaces(String replaces) {
     }
 
     @JsonProperty("selector")
-    public ClusterServiceVersionSpecSelector getSelector() {
+    public LabelSelector getSelector() {
         return selector;
     }
 
     @JsonProperty("selector")
-    public void setSelector(ClusterServiceVersionSpecSelector selector) {
+    public void setSelector(LabelSelector selector) {
         this.selector = selector;
     }
 
@@ -404,12 +405,12 @@ public void setVersion(String version) {
 
     @JsonProperty("webhookdefinitions")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecWebhookdefinitions> getWebhookdefinitions() {
+    public List<WebhookDescription> getWebhookdefinitions() {
         return webhookdefinitions;
     }
 
     @JsonProperty("webhookdefinitions")
-    public void setWebhookdefinitions(List<ClusterServiceVersionSpecWebhookdefinitions> webhookdefinitions) {
+    public void setWebhookdefinitions(List<WebhookDescription> webhookdefinitions) {
         this.webhookdefinitions = webhookdefinitions;
     }
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecAOActionDescriptors.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecAOActionDescriptors.java
deleted file mode 100644
index 223b3e11e41..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecAOActionDescriptors.java
+++ /dev/null
@@ -1,168 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "description",
-    "displayName",
-    "path",
-    "value",
-    "x-descriptors"
-})
-@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 ClusterServiceVersionSpecAOActionDescriptors implements Editable<ClusterServiceVersionSpecAOActionDescriptorsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("description")
-    private String description;
-    @JsonProperty("displayName")
-    private String displayName;
-    @JsonProperty("path")
-    private String path;
-    @JsonProperty("value")
-    private String value;
-    @JsonProperty("x-descriptors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> xDescriptors = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecAOActionDescriptors() {
-    }
-
-    public ClusterServiceVersionSpecAOActionDescriptors(String description, String displayName, String path, String value, List<String> xDescriptors) {
-        super();
-        this.description = description;
-        this.displayName = displayName;
-        this.path = path;
-        this.value = value;
-        this.xDescriptors = xDescriptors;
-    }
-
-    @JsonProperty("description")
-    public String getDescription() {
-        return description;
-    }
-
-    @JsonProperty("description")
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    @JsonProperty("displayName")
-    public String getDisplayName() {
-        return displayName;
-    }
-
-    @JsonProperty("displayName")
-    public void setDisplayName(String displayName) {
-        this.displayName = displayName;
-    }
-
-    @JsonProperty("path")
-    public String getPath() {
-        return path;
-    }
-
-    @JsonProperty("path")
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @JsonProperty("value")
-    public String getValue() {
-        return value;
-    }
-
-    @JsonProperty("value")
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    @JsonProperty("x-descriptors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getXDescriptors() {
-        return xDescriptors;
-    }
-
-    @JsonProperty("x-descriptors")
-    public void setXDescriptors(List<String> xDescriptors) {
-        this.xDescriptors = xDescriptors;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecAOActionDescriptorsBuilder edit() {
-        return new ClusterServiceVersionSpecAOActionDescriptorsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecAOActionDescriptorsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecAOSpecDescriptors.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecAOSpecDescriptors.java
deleted file mode 100644
index f374a75465e..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecAOSpecDescriptors.java
+++ /dev/null
@@ -1,168 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "description",
-    "displayName",
-    "path",
-    "value",
-    "x-descriptors"
-})
-@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 ClusterServiceVersionSpecAOSpecDescriptors implements Editable<ClusterServiceVersionSpecAOSpecDescriptorsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("description")
-    private String description;
-    @JsonProperty("displayName")
-    private String displayName;
-    @JsonProperty("path")
-    private String path;
-    @JsonProperty("value")
-    private String value;
-    @JsonProperty("x-descriptors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> xDescriptors = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecAOSpecDescriptors() {
-    }
-
-    public ClusterServiceVersionSpecAOSpecDescriptors(String description, String displayName, String path, String value, List<String> xDescriptors) {
-        super();
-        this.description = description;
-        this.displayName = displayName;
-        this.path = path;
-        this.value = value;
-        this.xDescriptors = xDescriptors;
-    }
-
-    @JsonProperty("description")
-    public String getDescription() {
-        return description;
-    }
-
-    @JsonProperty("description")
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    @JsonProperty("displayName")
-    public String getDisplayName() {
-        return displayName;
-    }
-
-    @JsonProperty("displayName")
-    public void setDisplayName(String displayName) {
-        this.displayName = displayName;
-    }
-
-    @JsonProperty("path")
-    public String getPath() {
-        return path;
-    }
-
-    @JsonProperty("path")
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @JsonProperty("value")
-    public String getValue() {
-        return value;
-    }
-
-    @JsonProperty("value")
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    @JsonProperty("x-descriptors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getXDescriptors() {
-        return xDescriptors;
-    }
-
-    @JsonProperty("x-descriptors")
-    public void setXDescriptors(List<String> xDescriptors) {
-        this.xDescriptors = xDescriptors;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecAOSpecDescriptorsBuilder edit() {
-        return new ClusterServiceVersionSpecAOSpecDescriptorsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecAOSpecDescriptorsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecAOStatusDescriptors.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecAOStatusDescriptors.java
deleted file mode 100644
index 1b6b3c0fca3..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecAOStatusDescriptors.java
+++ /dev/null
@@ -1,168 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "description",
-    "displayName",
-    "path",
-    "value",
-    "x-descriptors"
-})
-@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 ClusterServiceVersionSpecAOStatusDescriptors implements Editable<ClusterServiceVersionSpecAOStatusDescriptorsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("description")
-    private String description;
-    @JsonProperty("displayName")
-    private String displayName;
-    @JsonProperty("path")
-    private String path;
-    @JsonProperty("value")
-    private String value;
-    @JsonProperty("x-descriptors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> xDescriptors = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecAOStatusDescriptors() {
-    }
-
-    public ClusterServiceVersionSpecAOStatusDescriptors(String description, String displayName, String path, String value, List<String> xDescriptors) {
-        super();
-        this.description = description;
-        this.displayName = displayName;
-        this.path = path;
-        this.value = value;
-        this.xDescriptors = xDescriptors;
-    }
-
-    @JsonProperty("description")
-    public String getDescription() {
-        return description;
-    }
-
-    @JsonProperty("description")
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    @JsonProperty("displayName")
-    public String getDisplayName() {
-        return displayName;
-    }
-
-    @JsonProperty("displayName")
-    public void setDisplayName(String displayName) {
-        this.displayName = displayName;
-    }
-
-    @JsonProperty("path")
-    public String getPath() {
-        return path;
-    }
-
-    @JsonProperty("path")
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @JsonProperty("value")
-    public String getValue() {
-        return value;
-    }
-
-    @JsonProperty("value")
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    @JsonProperty("x-descriptors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getXDescriptors() {
-        return xDescriptors;
-    }
-
-    @JsonProperty("x-descriptors")
-    public void setXDescriptors(List<String> xDescriptors) {
-        this.xDescriptors = xDescriptors;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecAOStatusDescriptorsBuilder edit() {
-        return new ClusterServiceVersionSpecAOStatusDescriptorsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecAOStatusDescriptorsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecAOwned.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecAOwned.java
deleted file mode 100644
index c15d274ef2e..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecAOwned.java
+++ /dev/null
@@ -1,272 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "kind",
-    "actionDescriptors",
-    "containerPort",
-    "deploymentName",
-    "description",
-    "displayName",
-    "group",
-    "name",
-    "resources",
-    "specDescriptors",
-    "statusDescriptors",
-    "version"
-})
-@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 ClusterServiceVersionSpecAOwned implements Editable<ClusterServiceVersionSpecAOwnedBuilder> , KubernetesResource
-{
-
-    @JsonProperty("actionDescriptors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecAOActionDescriptors> actionDescriptors = new ArrayList<>();
-    @JsonProperty("containerPort")
-    private Integer containerPort;
-    @JsonProperty("deploymentName")
-    private String deploymentName;
-    @JsonProperty("description")
-    private String description;
-    @JsonProperty("displayName")
-    private String displayName;
-    @JsonProperty("group")
-    private String group;
-    @JsonProperty("kind")
-    private String kind;
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("resources")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<APIResourceReference> resources = new ArrayList<>();
-    @JsonProperty("specDescriptors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecAOSpecDescriptors> specDescriptors = new ArrayList<>();
-    @JsonProperty("statusDescriptors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecAOStatusDescriptors> statusDescriptors = new ArrayList<>();
-    @JsonProperty("version")
-    private String version;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecAOwned() {
-    }
-
-    public ClusterServiceVersionSpecAOwned(List<ClusterServiceVersionSpecAOActionDescriptors> actionDescriptors, Integer containerPort, String deploymentName, String description, String displayName, String group, String kind, String name, List<APIResourceReference> resources, List<ClusterServiceVersionSpecAOSpecDescriptors> specDescriptors, List<ClusterServiceVersionSpecAOStatusDescriptors> statusDescriptors, String version) {
-        super();
-        this.actionDescriptors = actionDescriptors;
-        this.containerPort = containerPort;
-        this.deploymentName = deploymentName;
-        this.description = description;
-        this.displayName = displayName;
-        this.group = group;
-        this.kind = kind;
-        this.name = name;
-        this.resources = resources;
-        this.specDescriptors = specDescriptors;
-        this.statusDescriptors = statusDescriptors;
-        this.version = version;
-    }
-
-    @JsonProperty("actionDescriptors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecAOActionDescriptors> getActionDescriptors() {
-        return actionDescriptors;
-    }
-
-    @JsonProperty("actionDescriptors")
-    public void setActionDescriptors(List<ClusterServiceVersionSpecAOActionDescriptors> actionDescriptors) {
-        this.actionDescriptors = actionDescriptors;
-    }
-
-    @JsonProperty("containerPort")
-    public Integer getContainerPort() {
-        return containerPort;
-    }
-
-    @JsonProperty("containerPort")
-    public void setContainerPort(Integer containerPort) {
-        this.containerPort = containerPort;
-    }
-
-    @JsonProperty("deploymentName")
-    public String getDeploymentName() {
-        return deploymentName;
-    }
-
-    @JsonProperty("deploymentName")
-    public void setDeploymentName(String deploymentName) {
-        this.deploymentName = deploymentName;
-    }
-
-    @JsonProperty("description")
-    public String getDescription() {
-        return description;
-    }
-
-    @JsonProperty("description")
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    @JsonProperty("displayName")
-    public String getDisplayName() {
-        return displayName;
-    }
-
-    @JsonProperty("displayName")
-    public void setDisplayName(String displayName) {
-        this.displayName = displayName;
-    }
-
-    @JsonProperty("group")
-    public String getGroup() {
-        return group;
-    }
-
-    @JsonProperty("group")
-    public void setGroup(String group) {
-        this.group = group;
-    }
-
-    @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("resources")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<APIResourceReference> getResources() {
-        return resources;
-    }
-
-    @JsonProperty("resources")
-    public void setResources(List<APIResourceReference> resources) {
-        this.resources = resources;
-    }
-
-    @JsonProperty("specDescriptors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecAOSpecDescriptors> getSpecDescriptors() {
-        return specDescriptors;
-    }
-
-    @JsonProperty("specDescriptors")
-    public void setSpecDescriptors(List<ClusterServiceVersionSpecAOSpecDescriptors> specDescriptors) {
-        this.specDescriptors = specDescriptors;
-    }
-
-    @JsonProperty("statusDescriptors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecAOStatusDescriptors> getStatusDescriptors() {
-        return statusDescriptors;
-    }
-
-    @JsonProperty("statusDescriptors")
-    public void setStatusDescriptors(List<ClusterServiceVersionSpecAOStatusDescriptors> statusDescriptors) {
-        this.statusDescriptors = statusDescriptors;
-    }
-
-    @JsonProperty("version")
-    public String getVersion() {
-        return version;
-    }
-
-    @JsonProperty("version")
-    public void setVersion(String version) {
-        this.version = version;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecAOwnedBuilder edit() {
-        return new ClusterServiceVersionSpecAOwnedBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecAOwnedBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecARActionDescriptors.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecARActionDescriptors.java
deleted file mode 100644
index e7416834e1c..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecARActionDescriptors.java
+++ /dev/null
@@ -1,168 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "description",
-    "displayName",
-    "path",
-    "value",
-    "x-descriptors"
-})
-@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 ClusterServiceVersionSpecARActionDescriptors implements Editable<ClusterServiceVersionSpecARActionDescriptorsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("description")
-    private String description;
-    @JsonProperty("displayName")
-    private String displayName;
-    @JsonProperty("path")
-    private String path;
-    @JsonProperty("value")
-    private String value;
-    @JsonProperty("x-descriptors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> xDescriptors = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecARActionDescriptors() {
-    }
-
-    public ClusterServiceVersionSpecARActionDescriptors(String description, String displayName, String path, String value, List<String> xDescriptors) {
-        super();
-        this.description = description;
-        this.displayName = displayName;
-        this.path = path;
-        this.value = value;
-        this.xDescriptors = xDescriptors;
-    }
-
-    @JsonProperty("description")
-    public String getDescription() {
-        return description;
-    }
-
-    @JsonProperty("description")
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    @JsonProperty("displayName")
-    public String getDisplayName() {
-        return displayName;
-    }
-
-    @JsonProperty("displayName")
-    public void setDisplayName(String displayName) {
-        this.displayName = displayName;
-    }
-
-    @JsonProperty("path")
-    public String getPath() {
-        return path;
-    }
-
-    @JsonProperty("path")
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @JsonProperty("value")
-    public String getValue() {
-        return value;
-    }
-
-    @JsonProperty("value")
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    @JsonProperty("x-descriptors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getXDescriptors() {
-        return xDescriptors;
-    }
-
-    @JsonProperty("x-descriptors")
-    public void setXDescriptors(List<String> xDescriptors) {
-        this.xDescriptors = xDescriptors;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecARActionDescriptorsBuilder edit() {
-        return new ClusterServiceVersionSpecARActionDescriptorsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecARActionDescriptorsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecARSpecDescriptors.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecARSpecDescriptors.java
deleted file mode 100644
index cf7bfd1308f..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecARSpecDescriptors.java
+++ /dev/null
@@ -1,168 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "description",
-    "displayName",
-    "path",
-    "value",
-    "x-descriptors"
-})
-@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 ClusterServiceVersionSpecARSpecDescriptors implements Editable<ClusterServiceVersionSpecARSpecDescriptorsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("description")
-    private String description;
-    @JsonProperty("displayName")
-    private String displayName;
-    @JsonProperty("path")
-    private String path;
-    @JsonProperty("value")
-    private String value;
-    @JsonProperty("x-descriptors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> xDescriptors = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecARSpecDescriptors() {
-    }
-
-    public ClusterServiceVersionSpecARSpecDescriptors(String description, String displayName, String path, String value, List<String> xDescriptors) {
-        super();
-        this.description = description;
-        this.displayName = displayName;
-        this.path = path;
-        this.value = value;
-        this.xDescriptors = xDescriptors;
-    }
-
-    @JsonProperty("description")
-    public String getDescription() {
-        return description;
-    }
-
-    @JsonProperty("description")
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    @JsonProperty("displayName")
-    public String getDisplayName() {
-        return displayName;
-    }
-
-    @JsonProperty("displayName")
-    public void setDisplayName(String displayName) {
-        this.displayName = displayName;
-    }
-
-    @JsonProperty("path")
-    public String getPath() {
-        return path;
-    }
-
-    @JsonProperty("path")
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @JsonProperty("value")
-    public String getValue() {
-        return value;
-    }
-
-    @JsonProperty("value")
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    @JsonProperty("x-descriptors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getXDescriptors() {
-        return xDescriptors;
-    }
-
-    @JsonProperty("x-descriptors")
-    public void setXDescriptors(List<String> xDescriptors) {
-        this.xDescriptors = xDescriptors;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecARSpecDescriptorsBuilder edit() {
-        return new ClusterServiceVersionSpecARSpecDescriptorsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecARSpecDescriptorsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecARStatusDescriptors.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecARStatusDescriptors.java
deleted file mode 100644
index d6eaef477c5..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecARStatusDescriptors.java
+++ /dev/null
@@ -1,168 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "description",
-    "displayName",
-    "path",
-    "value",
-    "x-descriptors"
-})
-@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 ClusterServiceVersionSpecARStatusDescriptors implements Editable<ClusterServiceVersionSpecARStatusDescriptorsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("description")
-    private String description;
-    @JsonProperty("displayName")
-    private String displayName;
-    @JsonProperty("path")
-    private String path;
-    @JsonProperty("value")
-    private String value;
-    @JsonProperty("x-descriptors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> xDescriptors = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecARStatusDescriptors() {
-    }
-
-    public ClusterServiceVersionSpecARStatusDescriptors(String description, String displayName, String path, String value, List<String> xDescriptors) {
-        super();
-        this.description = description;
-        this.displayName = displayName;
-        this.path = path;
-        this.value = value;
-        this.xDescriptors = xDescriptors;
-    }
-
-    @JsonProperty("description")
-    public String getDescription() {
-        return description;
-    }
-
-    @JsonProperty("description")
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    @JsonProperty("displayName")
-    public String getDisplayName() {
-        return displayName;
-    }
-
-    @JsonProperty("displayName")
-    public void setDisplayName(String displayName) {
-        this.displayName = displayName;
-    }
-
-    @JsonProperty("path")
-    public String getPath() {
-        return path;
-    }
-
-    @JsonProperty("path")
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @JsonProperty("value")
-    public String getValue() {
-        return value;
-    }
-
-    @JsonProperty("value")
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    @JsonProperty("x-descriptors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getXDescriptors() {
-        return xDescriptors;
-    }
-
-    @JsonProperty("x-descriptors")
-    public void setXDescriptors(List<String> xDescriptors) {
-        this.xDescriptors = xDescriptors;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecARStatusDescriptorsBuilder edit() {
-        return new ClusterServiceVersionSpecARStatusDescriptorsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecARStatusDescriptorsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecARequired.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecARequired.java
deleted file mode 100644
index 0b404f39c15..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecARequired.java
+++ /dev/null
@@ -1,272 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "kind",
-    "actionDescriptors",
-    "containerPort",
-    "deploymentName",
-    "description",
-    "displayName",
-    "group",
-    "name",
-    "resources",
-    "specDescriptors",
-    "statusDescriptors",
-    "version"
-})
-@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 ClusterServiceVersionSpecARequired implements Editable<ClusterServiceVersionSpecARequiredBuilder> , KubernetesResource
-{
-
-    @JsonProperty("actionDescriptors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecARActionDescriptors> actionDescriptors = new ArrayList<>();
-    @JsonProperty("containerPort")
-    private Integer containerPort;
-    @JsonProperty("deploymentName")
-    private String deploymentName;
-    @JsonProperty("description")
-    private String description;
-    @JsonProperty("displayName")
-    private String displayName;
-    @JsonProperty("group")
-    private String group;
-    @JsonProperty("kind")
-    private String kind;
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("resources")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<APIResourceReference> resources = new ArrayList<>();
-    @JsonProperty("specDescriptors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecARSpecDescriptors> specDescriptors = new ArrayList<>();
-    @JsonProperty("statusDescriptors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecARStatusDescriptors> statusDescriptors = new ArrayList<>();
-    @JsonProperty("version")
-    private String version;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecARequired() {
-    }
-
-    public ClusterServiceVersionSpecARequired(List<ClusterServiceVersionSpecARActionDescriptors> actionDescriptors, Integer containerPort, String deploymentName, String description, String displayName, String group, String kind, String name, List<APIResourceReference> resources, List<ClusterServiceVersionSpecARSpecDescriptors> specDescriptors, List<ClusterServiceVersionSpecARStatusDescriptors> statusDescriptors, String version) {
-        super();
-        this.actionDescriptors = actionDescriptors;
-        this.containerPort = containerPort;
-        this.deploymentName = deploymentName;
-        this.description = description;
-        this.displayName = displayName;
-        this.group = group;
-        this.kind = kind;
-        this.name = name;
-        this.resources = resources;
-        this.specDescriptors = specDescriptors;
-        this.statusDescriptors = statusDescriptors;
-        this.version = version;
-    }
-
-    @JsonProperty("actionDescriptors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecARActionDescriptors> getActionDescriptors() {
-        return actionDescriptors;
-    }
-
-    @JsonProperty("actionDescriptors")
-    public void setActionDescriptors(List<ClusterServiceVersionSpecARActionDescriptors> actionDescriptors) {
-        this.actionDescriptors = actionDescriptors;
-    }
-
-    @JsonProperty("containerPort")
-    public Integer getContainerPort() {
-        return containerPort;
-    }
-
-    @JsonProperty("containerPort")
-    public void setContainerPort(Integer containerPort) {
-        this.containerPort = containerPort;
-    }
-
-    @JsonProperty("deploymentName")
-    public String getDeploymentName() {
-        return deploymentName;
-    }
-
-    @JsonProperty("deploymentName")
-    public void setDeploymentName(String deploymentName) {
-        this.deploymentName = deploymentName;
-    }
-
-    @JsonProperty("description")
-    public String getDescription() {
-        return description;
-    }
-
-    @JsonProperty("description")
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    @JsonProperty("displayName")
-    public String getDisplayName() {
-        return displayName;
-    }
-
-    @JsonProperty("displayName")
-    public void setDisplayName(String displayName) {
-        this.displayName = displayName;
-    }
-
-    @JsonProperty("group")
-    public String getGroup() {
-        return group;
-    }
-
-    @JsonProperty("group")
-    public void setGroup(String group) {
-        this.group = group;
-    }
-
-    @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("resources")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<APIResourceReference> getResources() {
-        return resources;
-    }
-
-    @JsonProperty("resources")
-    public void setResources(List<APIResourceReference> resources) {
-        this.resources = resources;
-    }
-
-    @JsonProperty("specDescriptors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecARSpecDescriptors> getSpecDescriptors() {
-        return specDescriptors;
-    }
-
-    @JsonProperty("specDescriptors")
-    public void setSpecDescriptors(List<ClusterServiceVersionSpecARSpecDescriptors> specDescriptors) {
-        this.specDescriptors = specDescriptors;
-    }
-
-    @JsonProperty("statusDescriptors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecARStatusDescriptors> getStatusDescriptors() {
-        return statusDescriptors;
-    }
-
-    @JsonProperty("statusDescriptors")
-    public void setStatusDescriptors(List<ClusterServiceVersionSpecARStatusDescriptors> statusDescriptors) {
-        this.statusDescriptors = statusDescriptors;
-    }
-
-    @JsonProperty("version")
-    public String getVersion() {
-        return version;
-    }
-
-    @JsonProperty("version")
-    public void setVersion(String version) {
-        this.version = version;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecARequiredBuilder edit() {
-        return new ClusterServiceVersionSpecARequiredBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecARequiredBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecApiservicedefinitions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecApiservicedefinitions.java
deleted file mode 100644
index 61f0e4b8825..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecApiservicedefinitions.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "owned",
-    "required"
-})
-@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 ClusterServiceVersionSpecApiservicedefinitions implements Editable<ClusterServiceVersionSpecApiservicedefinitionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("owned")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecAOwned> owned = new ArrayList<>();
-    @JsonProperty("required")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecARequired> required = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecApiservicedefinitions() {
-    }
-
-    public ClusterServiceVersionSpecApiservicedefinitions(List<ClusterServiceVersionSpecAOwned> owned, List<ClusterServiceVersionSpecARequired> required) {
-        super();
-        this.owned = owned;
-        this.required = required;
-    }
-
-    @JsonProperty("owned")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecAOwned> getOwned() {
-        return owned;
-    }
-
-    @JsonProperty("owned")
-    public void setOwned(List<ClusterServiceVersionSpecAOwned> owned) {
-        this.owned = owned;
-    }
-
-    @JsonProperty("required")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecARequired> getRequired() {
-        return required;
-    }
-
-    @JsonProperty("required")
-    public void setRequired(List<ClusterServiceVersionSpecARequired> required) {
-        this.required = required;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecApiservicedefinitionsBuilder edit() {
-        return new ClusterServiceVersionSpecApiservicedefinitionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecApiservicedefinitionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecCOActionDescriptors.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecCOActionDescriptors.java
deleted file mode 100644
index 0dc99404a6d..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecCOActionDescriptors.java
+++ /dev/null
@@ -1,168 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "description",
-    "displayName",
-    "path",
-    "value",
-    "x-descriptors"
-})
-@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 ClusterServiceVersionSpecCOActionDescriptors implements Editable<ClusterServiceVersionSpecCOActionDescriptorsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("description")
-    private String description;
-    @JsonProperty("displayName")
-    private String displayName;
-    @JsonProperty("path")
-    private String path;
-    @JsonProperty("value")
-    private String value;
-    @JsonProperty("x-descriptors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> xDescriptors = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecCOActionDescriptors() {
-    }
-
-    public ClusterServiceVersionSpecCOActionDescriptors(String description, String displayName, String path, String value, List<String> xDescriptors) {
-        super();
-        this.description = description;
-        this.displayName = displayName;
-        this.path = path;
-        this.value = value;
-        this.xDescriptors = xDescriptors;
-    }
-
-    @JsonProperty("description")
-    public String getDescription() {
-        return description;
-    }
-
-    @JsonProperty("description")
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    @JsonProperty("displayName")
-    public String getDisplayName() {
-        return displayName;
-    }
-
-    @JsonProperty("displayName")
-    public void setDisplayName(String displayName) {
-        this.displayName = displayName;
-    }
-
-    @JsonProperty("path")
-    public String getPath() {
-        return path;
-    }
-
-    @JsonProperty("path")
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @JsonProperty("value")
-    public String getValue() {
-        return value;
-    }
-
-    @JsonProperty("value")
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    @JsonProperty("x-descriptors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getXDescriptors() {
-        return xDescriptors;
-    }
-
-    @JsonProperty("x-descriptors")
-    public void setXDescriptors(List<String> xDescriptors) {
-        this.xDescriptors = xDescriptors;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecCOActionDescriptorsBuilder edit() {
-        return new ClusterServiceVersionSpecCOActionDescriptorsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecCOActionDescriptorsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecCOSpecDescriptors.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecCOSpecDescriptors.java
deleted file mode 100644
index 5dba73fa334..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecCOSpecDescriptors.java
+++ /dev/null
@@ -1,168 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "description",
-    "displayName",
-    "path",
-    "value",
-    "x-descriptors"
-})
-@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 ClusterServiceVersionSpecCOSpecDescriptors implements Editable<ClusterServiceVersionSpecCOSpecDescriptorsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("description")
-    private String description;
-    @JsonProperty("displayName")
-    private String displayName;
-    @JsonProperty("path")
-    private String path;
-    @JsonProperty("value")
-    private String value;
-    @JsonProperty("x-descriptors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> xDescriptors = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecCOSpecDescriptors() {
-    }
-
-    public ClusterServiceVersionSpecCOSpecDescriptors(String description, String displayName, String path, String value, List<String> xDescriptors) {
-        super();
-        this.description = description;
-        this.displayName = displayName;
-        this.path = path;
-        this.value = value;
-        this.xDescriptors = xDescriptors;
-    }
-
-    @JsonProperty("description")
-    public String getDescription() {
-        return description;
-    }
-
-    @JsonProperty("description")
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    @JsonProperty("displayName")
-    public String getDisplayName() {
-        return displayName;
-    }
-
-    @JsonProperty("displayName")
-    public void setDisplayName(String displayName) {
-        this.displayName = displayName;
-    }
-
-    @JsonProperty("path")
-    public String getPath() {
-        return path;
-    }
-
-    @JsonProperty("path")
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @JsonProperty("value")
-    public String getValue() {
-        return value;
-    }
-
-    @JsonProperty("value")
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    @JsonProperty("x-descriptors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getXDescriptors() {
-        return xDescriptors;
-    }
-
-    @JsonProperty("x-descriptors")
-    public void setXDescriptors(List<String> xDescriptors) {
-        this.xDescriptors = xDescriptors;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecCOSpecDescriptorsBuilder edit() {
-        return new ClusterServiceVersionSpecCOSpecDescriptorsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecCOSpecDescriptorsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecCOStatusDescriptors.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecCOStatusDescriptors.java
deleted file mode 100644
index 1bb1a4c7609..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecCOStatusDescriptors.java
+++ /dev/null
@@ -1,168 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "description",
-    "displayName",
-    "path",
-    "value",
-    "x-descriptors"
-})
-@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 ClusterServiceVersionSpecCOStatusDescriptors implements Editable<ClusterServiceVersionSpecCOStatusDescriptorsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("description")
-    private String description;
-    @JsonProperty("displayName")
-    private String displayName;
-    @JsonProperty("path")
-    private String path;
-    @JsonProperty("value")
-    private String value;
-    @JsonProperty("x-descriptors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> xDescriptors = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecCOStatusDescriptors() {
-    }
-
-    public ClusterServiceVersionSpecCOStatusDescriptors(String description, String displayName, String path, String value, List<String> xDescriptors) {
-        super();
-        this.description = description;
-        this.displayName = displayName;
-        this.path = path;
-        this.value = value;
-        this.xDescriptors = xDescriptors;
-    }
-
-    @JsonProperty("description")
-    public String getDescription() {
-        return description;
-    }
-
-    @JsonProperty("description")
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    @JsonProperty("displayName")
-    public String getDisplayName() {
-        return displayName;
-    }
-
-    @JsonProperty("displayName")
-    public void setDisplayName(String displayName) {
-        this.displayName = displayName;
-    }
-
-    @JsonProperty("path")
-    public String getPath() {
-        return path;
-    }
-
-    @JsonProperty("path")
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @JsonProperty("value")
-    public String getValue() {
-        return value;
-    }
-
-    @JsonProperty("value")
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    @JsonProperty("x-descriptors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getXDescriptors() {
-        return xDescriptors;
-    }
-
-    @JsonProperty("x-descriptors")
-    public void setXDescriptors(List<String> xDescriptors) {
-        this.xDescriptors = xDescriptors;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecCOStatusDescriptorsBuilder edit() {
-        return new ClusterServiceVersionSpecCOStatusDescriptorsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecCOStatusDescriptorsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecCOwned.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecCOwned.java
deleted file mode 100644
index 169cac0c562..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecCOwned.java
+++ /dev/null
@@ -1,230 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "kind",
-    "actionDescriptors",
-    "description",
-    "displayName",
-    "name",
-    "resources",
-    "specDescriptors",
-    "statusDescriptors",
-    "version"
-})
-@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 ClusterServiceVersionSpecCOwned implements Editable<ClusterServiceVersionSpecCOwnedBuilder> , KubernetesResource
-{
-
-    @JsonProperty("actionDescriptors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecCOActionDescriptors> actionDescriptors = new ArrayList<>();
-    @JsonProperty("description")
-    private String description;
-    @JsonProperty("displayName")
-    private String displayName;
-    @JsonProperty("kind")
-    private String kind;
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("resources")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<APIResourceReference> resources = new ArrayList<>();
-    @JsonProperty("specDescriptors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecCOSpecDescriptors> specDescriptors = new ArrayList<>();
-    @JsonProperty("statusDescriptors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecCOStatusDescriptors> statusDescriptors = new ArrayList<>();
-    @JsonProperty("version")
-    private String version;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecCOwned() {
-    }
-
-    public ClusterServiceVersionSpecCOwned(List<ClusterServiceVersionSpecCOActionDescriptors> actionDescriptors, String description, String displayName, String kind, String name, List<APIResourceReference> resources, List<ClusterServiceVersionSpecCOSpecDescriptors> specDescriptors, List<ClusterServiceVersionSpecCOStatusDescriptors> statusDescriptors, String version) {
-        super();
-        this.actionDescriptors = actionDescriptors;
-        this.description = description;
-        this.displayName = displayName;
-        this.kind = kind;
-        this.name = name;
-        this.resources = resources;
-        this.specDescriptors = specDescriptors;
-        this.statusDescriptors = statusDescriptors;
-        this.version = version;
-    }
-
-    @JsonProperty("actionDescriptors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecCOActionDescriptors> getActionDescriptors() {
-        return actionDescriptors;
-    }
-
-    @JsonProperty("actionDescriptors")
-    public void setActionDescriptors(List<ClusterServiceVersionSpecCOActionDescriptors> actionDescriptors) {
-        this.actionDescriptors = actionDescriptors;
-    }
-
-    @JsonProperty("description")
-    public String getDescription() {
-        return description;
-    }
-
-    @JsonProperty("description")
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    @JsonProperty("displayName")
-    public String getDisplayName() {
-        return displayName;
-    }
-
-    @JsonProperty("displayName")
-    public void setDisplayName(String displayName) {
-        this.displayName = displayName;
-    }
-
-    @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("resources")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<APIResourceReference> getResources() {
-        return resources;
-    }
-
-    @JsonProperty("resources")
-    public void setResources(List<APIResourceReference> resources) {
-        this.resources = resources;
-    }
-
-    @JsonProperty("specDescriptors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecCOSpecDescriptors> getSpecDescriptors() {
-        return specDescriptors;
-    }
-
-    @JsonProperty("specDescriptors")
-    public void setSpecDescriptors(List<ClusterServiceVersionSpecCOSpecDescriptors> specDescriptors) {
-        this.specDescriptors = specDescriptors;
-    }
-
-    @JsonProperty("statusDescriptors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecCOStatusDescriptors> getStatusDescriptors() {
-        return statusDescriptors;
-    }
-
-    @JsonProperty("statusDescriptors")
-    public void setStatusDescriptors(List<ClusterServiceVersionSpecCOStatusDescriptors> statusDescriptors) {
-        this.statusDescriptors = statusDescriptors;
-    }
-
-    @JsonProperty("version")
-    public String getVersion() {
-        return version;
-    }
-
-    @JsonProperty("version")
-    public void setVersion(String version) {
-        this.version = version;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecCOwnedBuilder edit() {
-        return new ClusterServiceVersionSpecCOwnedBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecCOwnedBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecCRActionDescriptors.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecCRActionDescriptors.java
deleted file mode 100644
index a5d8bb78843..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecCRActionDescriptors.java
+++ /dev/null
@@ -1,168 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "description",
-    "displayName",
-    "path",
-    "value",
-    "x-descriptors"
-})
-@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 ClusterServiceVersionSpecCRActionDescriptors implements Editable<ClusterServiceVersionSpecCRActionDescriptorsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("description")
-    private String description;
-    @JsonProperty("displayName")
-    private String displayName;
-    @JsonProperty("path")
-    private String path;
-    @JsonProperty("value")
-    private String value;
-    @JsonProperty("x-descriptors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> xDescriptors = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecCRActionDescriptors() {
-    }
-
-    public ClusterServiceVersionSpecCRActionDescriptors(String description, String displayName, String path, String value, List<String> xDescriptors) {
-        super();
-        this.description = description;
-        this.displayName = displayName;
-        this.path = path;
-        this.value = value;
-        this.xDescriptors = xDescriptors;
-    }
-
-    @JsonProperty("description")
-    public String getDescription() {
-        return description;
-    }
-
-    @JsonProperty("description")
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    @JsonProperty("displayName")
-    public String getDisplayName() {
-        return displayName;
-    }
-
-    @JsonProperty("displayName")
-    public void setDisplayName(String displayName) {
-        this.displayName = displayName;
-    }
-
-    @JsonProperty("path")
-    public String getPath() {
-        return path;
-    }
-
-    @JsonProperty("path")
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @JsonProperty("value")
-    public String getValue() {
-        return value;
-    }
-
-    @JsonProperty("value")
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    @JsonProperty("x-descriptors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getXDescriptors() {
-        return xDescriptors;
-    }
-
-    @JsonProperty("x-descriptors")
-    public void setXDescriptors(List<String> xDescriptors) {
-        this.xDescriptors = xDescriptors;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecCRActionDescriptorsBuilder edit() {
-        return new ClusterServiceVersionSpecCRActionDescriptorsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecCRActionDescriptorsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecCRSpecDescriptors.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecCRSpecDescriptors.java
deleted file mode 100644
index bc2cd0a6ad8..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecCRSpecDescriptors.java
+++ /dev/null
@@ -1,168 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "description",
-    "displayName",
-    "path",
-    "value",
-    "x-descriptors"
-})
-@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 ClusterServiceVersionSpecCRSpecDescriptors implements Editable<ClusterServiceVersionSpecCRSpecDescriptorsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("description")
-    private String description;
-    @JsonProperty("displayName")
-    private String displayName;
-    @JsonProperty("path")
-    private String path;
-    @JsonProperty("value")
-    private String value;
-    @JsonProperty("x-descriptors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> xDescriptors = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecCRSpecDescriptors() {
-    }
-
-    public ClusterServiceVersionSpecCRSpecDescriptors(String description, String displayName, String path, String value, List<String> xDescriptors) {
-        super();
-        this.description = description;
-        this.displayName = displayName;
-        this.path = path;
-        this.value = value;
-        this.xDescriptors = xDescriptors;
-    }
-
-    @JsonProperty("description")
-    public String getDescription() {
-        return description;
-    }
-
-    @JsonProperty("description")
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    @JsonProperty("displayName")
-    public String getDisplayName() {
-        return displayName;
-    }
-
-    @JsonProperty("displayName")
-    public void setDisplayName(String displayName) {
-        this.displayName = displayName;
-    }
-
-    @JsonProperty("path")
-    public String getPath() {
-        return path;
-    }
-
-    @JsonProperty("path")
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @JsonProperty("value")
-    public String getValue() {
-        return value;
-    }
-
-    @JsonProperty("value")
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    @JsonProperty("x-descriptors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getXDescriptors() {
-        return xDescriptors;
-    }
-
-    @JsonProperty("x-descriptors")
-    public void setXDescriptors(List<String> xDescriptors) {
-        this.xDescriptors = xDescriptors;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecCRSpecDescriptorsBuilder edit() {
-        return new ClusterServiceVersionSpecCRSpecDescriptorsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecCRSpecDescriptorsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecCRStatusDescriptors.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecCRStatusDescriptors.java
deleted file mode 100644
index 946fa219ea3..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecCRStatusDescriptors.java
+++ /dev/null
@@ -1,168 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "description",
-    "displayName",
-    "path",
-    "value",
-    "x-descriptors"
-})
-@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 ClusterServiceVersionSpecCRStatusDescriptors implements Editable<ClusterServiceVersionSpecCRStatusDescriptorsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("description")
-    private String description;
-    @JsonProperty("displayName")
-    private String displayName;
-    @JsonProperty("path")
-    private String path;
-    @JsonProperty("value")
-    private String value;
-    @JsonProperty("x-descriptors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> xDescriptors = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecCRStatusDescriptors() {
-    }
-
-    public ClusterServiceVersionSpecCRStatusDescriptors(String description, String displayName, String path, String value, List<String> xDescriptors) {
-        super();
-        this.description = description;
-        this.displayName = displayName;
-        this.path = path;
-        this.value = value;
-        this.xDescriptors = xDescriptors;
-    }
-
-    @JsonProperty("description")
-    public String getDescription() {
-        return description;
-    }
-
-    @JsonProperty("description")
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    @JsonProperty("displayName")
-    public String getDisplayName() {
-        return displayName;
-    }
-
-    @JsonProperty("displayName")
-    public void setDisplayName(String displayName) {
-        this.displayName = displayName;
-    }
-
-    @JsonProperty("path")
-    public String getPath() {
-        return path;
-    }
-
-    @JsonProperty("path")
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @JsonProperty("value")
-    public String getValue() {
-        return value;
-    }
-
-    @JsonProperty("value")
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    @JsonProperty("x-descriptors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getXDescriptors() {
-        return xDescriptors;
-    }
-
-    @JsonProperty("x-descriptors")
-    public void setXDescriptors(List<String> xDescriptors) {
-        this.xDescriptors = xDescriptors;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecCRStatusDescriptorsBuilder edit() {
-        return new ClusterServiceVersionSpecCRStatusDescriptorsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecCRStatusDescriptorsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecCRequired.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecCRequired.java
deleted file mode 100644
index 76a9e5b62dc..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecCRequired.java
+++ /dev/null
@@ -1,230 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "kind",
-    "actionDescriptors",
-    "description",
-    "displayName",
-    "name",
-    "resources",
-    "specDescriptors",
-    "statusDescriptors",
-    "version"
-})
-@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 ClusterServiceVersionSpecCRequired implements Editable<ClusterServiceVersionSpecCRequiredBuilder> , KubernetesResource
-{
-
-    @JsonProperty("actionDescriptors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecCRActionDescriptors> actionDescriptors = new ArrayList<>();
-    @JsonProperty("description")
-    private String description;
-    @JsonProperty("displayName")
-    private String displayName;
-    @JsonProperty("kind")
-    private String kind;
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("resources")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<APIResourceReference> resources = new ArrayList<>();
-    @JsonProperty("specDescriptors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecCRSpecDescriptors> specDescriptors = new ArrayList<>();
-    @JsonProperty("statusDescriptors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecCRStatusDescriptors> statusDescriptors = new ArrayList<>();
-    @JsonProperty("version")
-    private String version;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecCRequired() {
-    }
-
-    public ClusterServiceVersionSpecCRequired(List<ClusterServiceVersionSpecCRActionDescriptors> actionDescriptors, String description, String displayName, String kind, String name, List<APIResourceReference> resources, List<ClusterServiceVersionSpecCRSpecDescriptors> specDescriptors, List<ClusterServiceVersionSpecCRStatusDescriptors> statusDescriptors, String version) {
-        super();
-        this.actionDescriptors = actionDescriptors;
-        this.description = description;
-        this.displayName = displayName;
-        this.kind = kind;
-        this.name = name;
-        this.resources = resources;
-        this.specDescriptors = specDescriptors;
-        this.statusDescriptors = statusDescriptors;
-        this.version = version;
-    }
-
-    @JsonProperty("actionDescriptors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecCRActionDescriptors> getActionDescriptors() {
-        return actionDescriptors;
-    }
-
-    @JsonProperty("actionDescriptors")
-    public void setActionDescriptors(List<ClusterServiceVersionSpecCRActionDescriptors> actionDescriptors) {
-        this.actionDescriptors = actionDescriptors;
-    }
-
-    @JsonProperty("description")
-    public String getDescription() {
-        return description;
-    }
-
-    @JsonProperty("description")
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    @JsonProperty("displayName")
-    public String getDisplayName() {
-        return displayName;
-    }
-
-    @JsonProperty("displayName")
-    public void setDisplayName(String displayName) {
-        this.displayName = displayName;
-    }
-
-    @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("resources")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<APIResourceReference> getResources() {
-        return resources;
-    }
-
-    @JsonProperty("resources")
-    public void setResources(List<APIResourceReference> resources) {
-        this.resources = resources;
-    }
-
-    @JsonProperty("specDescriptors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecCRSpecDescriptors> getSpecDescriptors() {
-        return specDescriptors;
-    }
-
-    @JsonProperty("specDescriptors")
-    public void setSpecDescriptors(List<ClusterServiceVersionSpecCRSpecDescriptors> specDescriptors) {
-        this.specDescriptors = specDescriptors;
-    }
-
-    @JsonProperty("statusDescriptors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecCRStatusDescriptors> getStatusDescriptors() {
-        return statusDescriptors;
-    }
-
-    @JsonProperty("statusDescriptors")
-    public void setStatusDescriptors(List<ClusterServiceVersionSpecCRStatusDescriptors> statusDescriptors) {
-        this.statusDescriptors = statusDescriptors;
-    }
-
-    @JsonProperty("version")
-    public String getVersion() {
-        return version;
-    }
-
-    @JsonProperty("version")
-    public void setVersion(String version) {
-        this.version = version;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecCRequiredBuilder edit() {
-        return new ClusterServiceVersionSpecCRequiredBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecCRequiredBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecCustomresourcedefinitions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecCustomresourcedefinitions.java
deleted file mode 100644
index 02181e11b44..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecCustomresourcedefinitions.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "owned",
-    "required"
-})
-@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 ClusterServiceVersionSpecCustomresourcedefinitions implements Editable<ClusterServiceVersionSpecCustomresourcedefinitionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("owned")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecCOwned> owned = new ArrayList<>();
-    @JsonProperty("required")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecCRequired> required = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecCustomresourcedefinitions() {
-    }
-
-    public ClusterServiceVersionSpecCustomresourcedefinitions(List<ClusterServiceVersionSpecCOwned> owned, List<ClusterServiceVersionSpecCRequired> required) {
-        super();
-        this.owned = owned;
-        this.required = required;
-    }
-
-    @JsonProperty("owned")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecCOwned> getOwned() {
-        return owned;
-    }
-
-    @JsonProperty("owned")
-    public void setOwned(List<ClusterServiceVersionSpecCOwned> owned) {
-        this.owned = owned;
-    }
-
-    @JsonProperty("required")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecCRequired> getRequired() {
-        return required;
-    }
-
-    @JsonProperty("required")
-    public void setRequired(List<ClusterServiceVersionSpecCRequired> required) {
-        this.required = required;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecCustomresourcedefinitionsBuilder edit() {
-        return new ClusterServiceVersionSpecCustomresourcedefinitionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecCustomresourcedefinitionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecCPRules.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecCPRules.java
deleted file mode 100644
index 773c282cbb9..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecCPRules.java
+++ /dev/null
@@ -1,176 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "apiGroups",
-    "nonResourceURLs",
-    "resourceNames",
-    "resources",
-    "verbs"
-})
-@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 ClusterServiceVersionSpecISpecCPRules implements Editable<ClusterServiceVersionSpecISpecCPRulesBuilder> , KubernetesResource
-{
-
-    @JsonProperty("apiGroups")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> apiGroups = new ArrayList<>();
-    @JsonProperty("nonResourceURLs")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> nonResourceURLs = new ArrayList<>();
-    @JsonProperty("resourceNames")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> resourceNames = new ArrayList<>();
-    @JsonProperty("resources")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> resources = new ArrayList<>();
-    @JsonProperty("verbs")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> verbs = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecCPRules() {
-    }
-
-    public ClusterServiceVersionSpecISpecCPRules(List<String> apiGroups, List<String> nonResourceURLs, List<String> resourceNames, List<String> resources, List<String> verbs) {
-        super();
-        this.apiGroups = apiGroups;
-        this.nonResourceURLs = nonResourceURLs;
-        this.resourceNames = resourceNames;
-        this.resources = resources;
-        this.verbs = verbs;
-    }
-
-    @JsonProperty("apiGroups")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getApiGroups() {
-        return apiGroups;
-    }
-
-    @JsonProperty("apiGroups")
-    public void setApiGroups(List<String> apiGroups) {
-        this.apiGroups = apiGroups;
-    }
-
-    @JsonProperty("nonResourceURLs")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getNonResourceURLs() {
-        return nonResourceURLs;
-    }
-
-    @JsonProperty("nonResourceURLs")
-    public void setNonResourceURLs(List<String> nonResourceURLs) {
-        this.nonResourceURLs = nonResourceURLs;
-    }
-
-    @JsonProperty("resourceNames")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getResourceNames() {
-        return resourceNames;
-    }
-
-    @JsonProperty("resourceNames")
-    public void setResourceNames(List<String> resourceNames) {
-        this.resourceNames = resourceNames;
-    }
-
-    @JsonProperty("resources")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getResources() {
-        return resources;
-    }
-
-    @JsonProperty("resources")
-    public void setResources(List<String> resources) {
-        this.resources = resources;
-    }
-
-    @JsonProperty("verbs")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getVerbs() {
-        return verbs;
-    }
-
-    @JsonProperty("verbs")
-    public void setVerbs(List<String> verbs) {
-        this.verbs = verbs;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecCPRulesBuilder edit() {
-        return new ClusterServiceVersionSpecISpecCPRulesBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecCPRulesBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecClusterPermissions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecClusterPermissions.java
deleted file mode 100644
index 6acd6ddfb83..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecClusterPermissions.java
+++ /dev/null
@@ -1,126 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "rules",
-    "serviceAccountName"
-})
-@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 ClusterServiceVersionSpecISpecClusterPermissions implements Editable<ClusterServiceVersionSpecISpecClusterPermissionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("rules")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecCPRules> rules = new ArrayList<>();
-    @JsonProperty("serviceAccountName")
-    private String serviceAccountName;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecClusterPermissions() {
-    }
-
-    public ClusterServiceVersionSpecISpecClusterPermissions(List<ClusterServiceVersionSpecISpecCPRules> rules, String serviceAccountName) {
-        super();
-        this.rules = rules;
-        this.serviceAccountName = serviceAccountName;
-    }
-
-    @JsonProperty("rules")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecCPRules> getRules() {
-        return rules;
-    }
-
-    @JsonProperty("rules")
-    public void setRules(List<ClusterServiceVersionSpecISpecCPRules> rules) {
-        this.rules = rules;
-    }
-
-    @JsonProperty("serviceAccountName")
-    public String getServiceAccountName() {
-        return serviceAccountName;
-    }
-
-    @JsonProperty("serviceAccountName")
-    public void setServiceAccountName(String serviceAccountName) {
-        this.serviceAccountName = serviceAccountName;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecClusterPermissionsBuilder edit() {
-        return new ClusterServiceVersionSpecISpecClusterPermissionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecClusterPermissionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpec.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpec.java
deleted file mode 100644
index 60ef19e988b..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpec.java
+++ /dev/null
@@ -1,206 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "minReadySeconds",
-    "paused",
-    "progressDeadlineSeconds",
-    "replicas",
-    "revisionHistoryLimit",
-    "selector",
-    "strategy",
-    "template"
-})
-@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 ClusterServiceVersionSpecISpecDSpec implements Editable<ClusterServiceVersionSpecISpecDSpecBuilder> , KubernetesResource
-{
-
-    @JsonProperty("minReadySeconds")
-    private Integer minReadySeconds;
-    @JsonProperty("paused")
-    private Boolean paused;
-    @JsonProperty("progressDeadlineSeconds")
-    private Integer progressDeadlineSeconds;
-    @JsonProperty("replicas")
-    private Integer replicas;
-    @JsonProperty("revisionHistoryLimit")
-    private Integer revisionHistoryLimit;
-    @JsonProperty("selector")
-    private ClusterServiceVersionSpecISpecDSpecSelector selector;
-    @JsonProperty("strategy")
-    private ClusterServiceVersionSpecISpecDSpecStrategy strategy;
-    @JsonProperty("template")
-    private ClusterServiceVersionSpecISpecDSpecTemplate template;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpec() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpec(Integer minReadySeconds, Boolean paused, Integer progressDeadlineSeconds, Integer replicas, Integer revisionHistoryLimit, ClusterServiceVersionSpecISpecDSpecSelector selector, ClusterServiceVersionSpecISpecDSpecStrategy strategy, ClusterServiceVersionSpecISpecDSpecTemplate template) {
-        super();
-        this.minReadySeconds = minReadySeconds;
-        this.paused = paused;
-        this.progressDeadlineSeconds = progressDeadlineSeconds;
-        this.replicas = replicas;
-        this.revisionHistoryLimit = revisionHistoryLimit;
-        this.selector = selector;
-        this.strategy = strategy;
-        this.template = template;
-    }
-
-    @JsonProperty("minReadySeconds")
-    public Integer getMinReadySeconds() {
-        return minReadySeconds;
-    }
-
-    @JsonProperty("minReadySeconds")
-    public void setMinReadySeconds(Integer minReadySeconds) {
-        this.minReadySeconds = minReadySeconds;
-    }
-
-    @JsonProperty("paused")
-    public Boolean getPaused() {
-        return paused;
-    }
-
-    @JsonProperty("paused")
-    public void setPaused(Boolean paused) {
-        this.paused = paused;
-    }
-
-    @JsonProperty("progressDeadlineSeconds")
-    public Integer getProgressDeadlineSeconds() {
-        return progressDeadlineSeconds;
-    }
-
-    @JsonProperty("progressDeadlineSeconds")
-    public void setProgressDeadlineSeconds(Integer progressDeadlineSeconds) {
-        this.progressDeadlineSeconds = progressDeadlineSeconds;
-    }
-
-    @JsonProperty("replicas")
-    public Integer getReplicas() {
-        return replicas;
-    }
-
-    @JsonProperty("replicas")
-    public void setReplicas(Integer replicas) {
-        this.replicas = replicas;
-    }
-
-    @JsonProperty("revisionHistoryLimit")
-    public Integer getRevisionHistoryLimit() {
-        return revisionHistoryLimit;
-    }
-
-    @JsonProperty("revisionHistoryLimit")
-    public void setRevisionHistoryLimit(Integer revisionHistoryLimit) {
-        this.revisionHistoryLimit = revisionHistoryLimit;
-    }
-
-    @JsonProperty("selector")
-    public ClusterServiceVersionSpecISpecDSpecSelector getSelector() {
-        return selector;
-    }
-
-    @JsonProperty("selector")
-    public void setSelector(ClusterServiceVersionSpecISpecDSpecSelector selector) {
-        this.selector = selector;
-    }
-
-    @JsonProperty("strategy")
-    public ClusterServiceVersionSpecISpecDSpecStrategy getStrategy() {
-        return strategy;
-    }
-
-    @JsonProperty("strategy")
-    public void setStrategy(ClusterServiceVersionSpecISpecDSpecStrategy strategy) {
-        this.strategy = strategy;
-    }
-
-    @JsonProperty("template")
-    public ClusterServiceVersionSpecISpecDSpecTemplate getTemplate() {
-        return template;
-    }
-
-    @JsonProperty("template")
-    public void setTemplate(ClusterServiceVersionSpecISpecDSpecTemplate template) {
-        this.template = template;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecSMatchExpressions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecSMatchExpressions.java
deleted file mode 100644
index 94be774a48b..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecSMatchExpressions.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "operator",
-    "values"
-})
-@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 ClusterServiceVersionSpecISpecDSpecSMatchExpressions implements Editable<ClusterServiceVersionSpecISpecDSpecSMatchExpressionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("operator")
-    private String operator;
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> values = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecSMatchExpressions() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecSMatchExpressions(String key, String operator, List<String> values) {
-        super();
-        this.key = key;
-        this.operator = operator;
-        this.values = values;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("operator")
-    public String getOperator() {
-        return operator;
-    }
-
-    @JsonProperty("operator")
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getValues() {
-        return values;
-    }
-
-    @JsonProperty("values")
-    public void setValues(List<String> values) {
-        this.values = values;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecSMatchExpressionsBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecSMatchExpressionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecSMatchExpressionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecSRollingUpdate.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecSRollingUpdate.java
deleted file mode 100644
index bd2c6d4a452..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecSRollingUpdate.java
+++ /dev/null
@@ -1,126 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "maxSurge",
-    "maxUnavailable"
-})
-@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 ClusterServiceVersionSpecISpecDSpecSRollingUpdate implements Editable<ClusterServiceVersionSpecISpecDSpecSRollingUpdateBuilder> , KubernetesResource
-{
-
-    @JsonProperty("maxSurge")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object maxSurge;
-    @JsonProperty("maxUnavailable")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object maxUnavailable;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecSRollingUpdate() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecSRollingUpdate(Object maxSurge, Object maxUnavailable) {
-        super();
-        this.maxSurge = maxSurge;
-        this.maxUnavailable = maxUnavailable;
-    }
-
-    @JsonProperty("maxSurge")
-    public Object getMaxSurge() {
-        return maxSurge;
-    }
-
-    @JsonProperty("maxSurge")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setMaxSurge(Object maxSurge) {
-        this.maxSurge = maxSurge;
-    }
-
-    @JsonProperty("maxUnavailable")
-    public Object getMaxUnavailable() {
-        return maxUnavailable;
-    }
-
-    @JsonProperty("maxUnavailable")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setMaxUnavailable(Object maxUnavailable) {
-        this.maxUnavailable = maxUnavailable;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecSRollingUpdateBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecSRollingUpdateBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecSRollingUpdateBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecSelector.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecSelector.java
deleted file mode 100644
index 7593e8bc55c..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecSelector.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "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 ClusterServiceVersionSpecISpecDSpecSelector implements Editable<ClusterServiceVersionSpecISpecDSpecSelectorBuilder> , KubernetesResource
-{
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecSMatchExpressions> matchExpressions = new ArrayList<>();
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, String> matchLabels = new LinkedHashMap<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecSelector() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecSelector(List<ClusterServiceVersionSpecISpecDSpecSMatchExpressions> matchExpressions, Map<String, String> matchLabels) {
-        super();
-        this.matchExpressions = matchExpressions;
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecSMatchExpressions> getMatchExpressions() {
-        return matchExpressions;
-    }
-
-    @JsonProperty("matchExpressions")
-    public void setMatchExpressions(List<ClusterServiceVersionSpecISpecDSpecSMatchExpressions> matchExpressions) {
-        this.matchExpressions = matchExpressions;
-    }
-
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, String> getMatchLabels() {
-        return matchLabels;
-    }
-
-    @JsonProperty("matchLabels")
-    public void setMatchLabels(Map<String, String> matchLabels) {
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecSelectorBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecSelectorBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecSelectorBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecStrategy.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecStrategy.java
deleted file mode 100644
index c2e2bf369cc..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecStrategy.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "rollingUpdate",
-    "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 ClusterServiceVersionSpecISpecDSpecStrategy implements Editable<ClusterServiceVersionSpecISpecDSpecStrategyBuilder> , KubernetesResource
-{
-
-    @JsonProperty("rollingUpdate")
-    private ClusterServiceVersionSpecISpecDSpecSRollingUpdate rollingUpdate;
-    @JsonProperty("type")
-    private String type;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecStrategy() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecStrategy(ClusterServiceVersionSpecISpecDSpecSRollingUpdate rollingUpdate, String type) {
-        super();
-        this.rollingUpdate = rollingUpdate;
-        this.type = type;
-    }
-
-    @JsonProperty("rollingUpdate")
-    public ClusterServiceVersionSpecISpecDSpecSRollingUpdate getRollingUpdate() {
-        return rollingUpdate;
-    }
-
-    @JsonProperty("rollingUpdate")
-    public void setRollingUpdate(ClusterServiceVersionSpecISpecDSpecSRollingUpdate rollingUpdate) {
-        this.rollingUpdate = rollingUpdate;
-    }
-
-    @JsonProperty("type")
-    public String getType() {
-        return type;
-    }
-
-    @JsonProperty("type")
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecStrategyBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecStrategyBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecStrategyBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpec.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpec.java
deleted file mode 100644
index 806f9ebe445..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpec.java
+++ /dev/null
@@ -1,671 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodReadinessGate;
-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({
-    "activeDeadlineSeconds",
-    "affinity",
-    "automountServiceAccountToken",
-    "containers",
-    "dnsConfig",
-    "dnsPolicy",
-    "enableServiceLinks",
-    "ephemeralContainers",
-    "hostAliases",
-    "hostIPC",
-    "hostNetwork",
-    "hostPID",
-    "hostUsers",
-    "hostname",
-    "imagePullSecrets",
-    "initContainers",
-    "nodeName",
-    "nodeSelector",
-    "os",
-    "overhead",
-    "preemptionPolicy",
-    "priority",
-    "priorityClassName",
-    "readinessGates",
-    "resourceClaims",
-    "restartPolicy",
-    "runtimeClassName",
-    "schedulerName",
-    "schedulingGates",
-    "securityContext",
-    "serviceAccount",
-    "serviceAccountName",
-    "setHostnameAsFQDN",
-    "shareProcessNamespace",
-    "subdomain",
-    "terminationGracePeriodSeconds",
-    "tolerations",
-    "topologySpreadConstraints",
-    "volumes"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpec implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecBuilder> , KubernetesResource
-{
-
-    @JsonProperty("activeDeadlineSeconds")
-    private Long activeDeadlineSeconds;
-    @JsonProperty("affinity")
-    private ClusterServiceVersionSpecISpecDSpecTSpecAffinity affinity;
-    @JsonProperty("automountServiceAccountToken")
-    private Boolean automountServiceAccountToken;
-    @JsonProperty("containers")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecContainers> containers = new ArrayList<>();
-    @JsonProperty("dnsConfig")
-    private ClusterServiceVersionSpecISpecDSpecTSpecDnsConfig dnsConfig;
-    @JsonProperty("dnsPolicy")
-    private String dnsPolicy;
-    @JsonProperty("enableServiceLinks")
-    private Boolean enableServiceLinks;
-    @JsonProperty("ephemeralContainers")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecEphemeralContainers> ephemeralContainers = new ArrayList<>();
-    @JsonProperty("hostAliases")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecHostAliases> hostAliases = new ArrayList<>();
-    @JsonProperty("hostIPC")
-    private Boolean hostIPC;
-    @JsonProperty("hostNetwork")
-    private Boolean hostNetwork;
-    @JsonProperty("hostPID")
-    private Boolean hostPID;
-    @JsonProperty("hostUsers")
-    private Boolean hostUsers;
-    @JsonProperty("hostname")
-    private String hostname;
-    @JsonProperty("imagePullSecrets")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecImagePullSecrets> imagePullSecrets = new ArrayList<>();
-    @JsonProperty("initContainers")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecInitContainers> initContainers = new ArrayList<>();
-    @JsonProperty("nodeName")
-    private String nodeName;
-    @JsonProperty("nodeSelector")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, String> nodeSelector = new LinkedHashMap<>();
-    @JsonProperty("os")
-    private ClusterServiceVersionSpecISpecDSpecTSpecOs os;
-    @JsonProperty("overhead")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializerForMap.class)
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, Object> overhead = new LinkedHashMap<>();
-    @JsonProperty("preemptionPolicy")
-    private String preemptionPolicy;
-    @JsonProperty("priority")
-    private Integer priority;
-    @JsonProperty("priorityClassName")
-    private String priorityClassName;
-    @JsonProperty("readinessGates")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<PodReadinessGate> readinessGates = new ArrayList<>();
-    @JsonProperty("resourceClaims")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecResourceClaims> resourceClaims = new ArrayList<>();
-    @JsonProperty("restartPolicy")
-    private String restartPolicy;
-    @JsonProperty("runtimeClassName")
-    private String runtimeClassName;
-    @JsonProperty("schedulerName")
-    private String schedulerName;
-    @JsonProperty("schedulingGates")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecSchedulingGates> schedulingGates = new ArrayList<>();
-    @JsonProperty("securityContext")
-    private ClusterServiceVersionSpecISpecDSpecTSpecSecurityContext securityContext;
-    @JsonProperty("serviceAccount")
-    private String serviceAccount;
-    @JsonProperty("serviceAccountName")
-    private String serviceAccountName;
-    @JsonProperty("setHostnameAsFQDN")
-    private Boolean setHostnameAsFQDN;
-    @JsonProperty("shareProcessNamespace")
-    private Boolean shareProcessNamespace;
-    @JsonProperty("subdomain")
-    private String subdomain;
-    @JsonProperty("terminationGracePeriodSeconds")
-    private Long terminationGracePeriodSeconds;
-    @JsonProperty("tolerations")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecTolerations> tolerations = new ArrayList<>();
-    @JsonProperty("topologySpreadConstraints")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecTopologySpreadConstraints> topologySpreadConstraints = new ArrayList<>();
-    @JsonProperty("volumes")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecVolumes> volumes = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpec() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpec(Long activeDeadlineSeconds, ClusterServiceVersionSpecISpecDSpecTSpecAffinity affinity, Boolean automountServiceAccountToken, List<ClusterServiceVersionSpecISpecDSpecTSpecContainers> containers, ClusterServiceVersionSpecISpecDSpecTSpecDnsConfig dnsConfig, String dnsPolicy, Boolean enableServiceLinks, List<ClusterServiceVersionSpecISpecDSpecTSpecEphemeralContainers> ephemeralContainers, List<ClusterServiceVersionSpecISpecDSpecTSpecHostAliases> hostAliases, Boolean hostIPC, Boolean hostNetwork, Boolean hostPID, Boolean hostUsers, String hostname, List<ClusterServiceVersionSpecISpecDSpecTSpecImagePullSecrets> imagePullSecrets, List<ClusterServiceVersionSpecISpecDSpecTSpecInitContainers> initContainers, String nodeName, Map<String, String> nodeSelector, ClusterServiceVersionSpecISpecDSpecTSpecOs os, Map<String, Object> overhead, String preemptionPolicy, Integer priority, String priorityClassName, List<PodReadinessGate> readinessGates, List<ClusterServiceVersionSpecISpecDSpecTSpecResourceClaims> resourceClaims, String restartPolicy, String runtimeClassName, String schedulerName, List<ClusterServiceVersionSpecISpecDSpecTSpecSchedulingGates> schedulingGates, ClusterServiceVersionSpecISpecDSpecTSpecSecurityContext securityContext, String serviceAccount, String serviceAccountName, Boolean setHostnameAsFQDN, Boolean shareProcessNamespace, String subdomain, Long terminationGracePeriodSeconds, List<ClusterServiceVersionSpecISpecDSpecTSpecTolerations> tolerations, List<ClusterServiceVersionSpecISpecDSpecTSpecTopologySpreadConstraints> topologySpreadConstraints, List<ClusterServiceVersionSpecISpecDSpecTSpecVolumes> volumes) {
-        super();
-        this.activeDeadlineSeconds = activeDeadlineSeconds;
-        this.affinity = affinity;
-        this.automountServiceAccountToken = automountServiceAccountToken;
-        this.containers = containers;
-        this.dnsConfig = dnsConfig;
-        this.dnsPolicy = dnsPolicy;
-        this.enableServiceLinks = enableServiceLinks;
-        this.ephemeralContainers = ephemeralContainers;
-        this.hostAliases = hostAliases;
-        this.hostIPC = hostIPC;
-        this.hostNetwork = hostNetwork;
-        this.hostPID = hostPID;
-        this.hostUsers = hostUsers;
-        this.hostname = hostname;
-        this.imagePullSecrets = imagePullSecrets;
-        this.initContainers = initContainers;
-        this.nodeName = nodeName;
-        this.nodeSelector = nodeSelector;
-        this.os = os;
-        this.overhead = overhead;
-        this.preemptionPolicy = preemptionPolicy;
-        this.priority = priority;
-        this.priorityClassName = priorityClassName;
-        this.readinessGates = readinessGates;
-        this.resourceClaims = resourceClaims;
-        this.restartPolicy = restartPolicy;
-        this.runtimeClassName = runtimeClassName;
-        this.schedulerName = schedulerName;
-        this.schedulingGates = schedulingGates;
-        this.securityContext = securityContext;
-        this.serviceAccount = serviceAccount;
-        this.serviceAccountName = serviceAccountName;
-        this.setHostnameAsFQDN = setHostnameAsFQDN;
-        this.shareProcessNamespace = shareProcessNamespace;
-        this.subdomain = subdomain;
-        this.terminationGracePeriodSeconds = terminationGracePeriodSeconds;
-        this.tolerations = tolerations;
-        this.topologySpreadConstraints = topologySpreadConstraints;
-        this.volumes = volumes;
-    }
-
-    @JsonProperty("activeDeadlineSeconds")
-    public Long getActiveDeadlineSeconds() {
-        return activeDeadlineSeconds;
-    }
-
-    @JsonProperty("activeDeadlineSeconds")
-    public void setActiveDeadlineSeconds(Long activeDeadlineSeconds) {
-        this.activeDeadlineSeconds = activeDeadlineSeconds;
-    }
-
-    @JsonProperty("affinity")
-    public ClusterServiceVersionSpecISpecDSpecTSpecAffinity getAffinity() {
-        return affinity;
-    }
-
-    @JsonProperty("affinity")
-    public void setAffinity(ClusterServiceVersionSpecISpecDSpecTSpecAffinity affinity) {
-        this.affinity = affinity;
-    }
-
-    @JsonProperty("automountServiceAccountToken")
-    public Boolean getAutomountServiceAccountToken() {
-        return automountServiceAccountToken;
-    }
-
-    @JsonProperty("automountServiceAccountToken")
-    public void setAutomountServiceAccountToken(Boolean automountServiceAccountToken) {
-        this.automountServiceAccountToken = automountServiceAccountToken;
-    }
-
-    @JsonProperty("containers")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecContainers> getContainers() {
-        return containers;
-    }
-
-    @JsonProperty("containers")
-    public void setContainers(List<ClusterServiceVersionSpecISpecDSpecTSpecContainers> containers) {
-        this.containers = containers;
-    }
-
-    @JsonProperty("dnsConfig")
-    public ClusterServiceVersionSpecISpecDSpecTSpecDnsConfig getDnsConfig() {
-        return dnsConfig;
-    }
-
-    @JsonProperty("dnsConfig")
-    public void setDnsConfig(ClusterServiceVersionSpecISpecDSpecTSpecDnsConfig dnsConfig) {
-        this.dnsConfig = dnsConfig;
-    }
-
-    @JsonProperty("dnsPolicy")
-    public String getDnsPolicy() {
-        return dnsPolicy;
-    }
-
-    @JsonProperty("dnsPolicy")
-    public void setDnsPolicy(String dnsPolicy) {
-        this.dnsPolicy = dnsPolicy;
-    }
-
-    @JsonProperty("enableServiceLinks")
-    public Boolean getEnableServiceLinks() {
-        return enableServiceLinks;
-    }
-
-    @JsonProperty("enableServiceLinks")
-    public void setEnableServiceLinks(Boolean enableServiceLinks) {
-        this.enableServiceLinks = enableServiceLinks;
-    }
-
-    @JsonProperty("ephemeralContainers")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecEphemeralContainers> getEphemeralContainers() {
-        return ephemeralContainers;
-    }
-
-    @JsonProperty("ephemeralContainers")
-    public void setEphemeralContainers(List<ClusterServiceVersionSpecISpecDSpecTSpecEphemeralContainers> ephemeralContainers) {
-        this.ephemeralContainers = ephemeralContainers;
-    }
-
-    @JsonProperty("hostAliases")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecHostAliases> getHostAliases() {
-        return hostAliases;
-    }
-
-    @JsonProperty("hostAliases")
-    public void setHostAliases(List<ClusterServiceVersionSpecISpecDSpecTSpecHostAliases> hostAliases) {
-        this.hostAliases = hostAliases;
-    }
-
-    @JsonProperty("hostIPC")
-    public Boolean getHostIPC() {
-        return hostIPC;
-    }
-
-    @JsonProperty("hostIPC")
-    public void setHostIPC(Boolean hostIPC) {
-        this.hostIPC = hostIPC;
-    }
-
-    @JsonProperty("hostNetwork")
-    public Boolean getHostNetwork() {
-        return hostNetwork;
-    }
-
-    @JsonProperty("hostNetwork")
-    public void setHostNetwork(Boolean hostNetwork) {
-        this.hostNetwork = hostNetwork;
-    }
-
-    @JsonProperty("hostPID")
-    public Boolean getHostPID() {
-        return hostPID;
-    }
-
-    @JsonProperty("hostPID")
-    public void setHostPID(Boolean hostPID) {
-        this.hostPID = hostPID;
-    }
-
-    @JsonProperty("hostUsers")
-    public Boolean getHostUsers() {
-        return hostUsers;
-    }
-
-    @JsonProperty("hostUsers")
-    public void setHostUsers(Boolean hostUsers) {
-        this.hostUsers = hostUsers;
-    }
-
-    @JsonProperty("hostname")
-    public String getHostname() {
-        return hostname;
-    }
-
-    @JsonProperty("hostname")
-    public void setHostname(String hostname) {
-        this.hostname = hostname;
-    }
-
-    @JsonProperty("imagePullSecrets")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecImagePullSecrets> getImagePullSecrets() {
-        return imagePullSecrets;
-    }
-
-    @JsonProperty("imagePullSecrets")
-    public void setImagePullSecrets(List<ClusterServiceVersionSpecISpecDSpecTSpecImagePullSecrets> imagePullSecrets) {
-        this.imagePullSecrets = imagePullSecrets;
-    }
-
-    @JsonProperty("initContainers")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecInitContainers> getInitContainers() {
-        return initContainers;
-    }
-
-    @JsonProperty("initContainers")
-    public void setInitContainers(List<ClusterServiceVersionSpecISpecDSpecTSpecInitContainers> initContainers) {
-        this.initContainers = initContainers;
-    }
-
-    @JsonProperty("nodeName")
-    public String getNodeName() {
-        return nodeName;
-    }
-
-    @JsonProperty("nodeName")
-    public void setNodeName(String nodeName) {
-        this.nodeName = nodeName;
-    }
-
-    @JsonProperty("nodeSelector")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, String> getNodeSelector() {
-        return nodeSelector;
-    }
-
-    @JsonProperty("nodeSelector")
-    public void setNodeSelector(Map<String, String> nodeSelector) {
-        this.nodeSelector = nodeSelector;
-    }
-
-    @JsonProperty("os")
-    public ClusterServiceVersionSpecISpecDSpecTSpecOs getOs() {
-        return os;
-    }
-
-    @JsonProperty("os")
-    public void setOs(ClusterServiceVersionSpecISpecDSpecTSpecOs os) {
-        this.os = os;
-    }
-
-    @JsonProperty("overhead")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, Object> getOverhead() {
-        return overhead;
-    }
-
-    @JsonProperty("overhead")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializerForMap.class)
-    public void setOverhead(Map<String, Object> overhead) {
-        this.overhead = overhead;
-    }
-
-    @JsonProperty("preemptionPolicy")
-    public String getPreemptionPolicy() {
-        return preemptionPolicy;
-    }
-
-    @JsonProperty("preemptionPolicy")
-    public void setPreemptionPolicy(String preemptionPolicy) {
-        this.preemptionPolicy = preemptionPolicy;
-    }
-
-    @JsonProperty("priority")
-    public Integer getPriority() {
-        return priority;
-    }
-
-    @JsonProperty("priority")
-    public void setPriority(Integer priority) {
-        this.priority = priority;
-    }
-
-    @JsonProperty("priorityClassName")
-    public String getPriorityClassName() {
-        return priorityClassName;
-    }
-
-    @JsonProperty("priorityClassName")
-    public void setPriorityClassName(String priorityClassName) {
-        this.priorityClassName = priorityClassName;
-    }
-
-    @JsonProperty("readinessGates")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<PodReadinessGate> getReadinessGates() {
-        return readinessGates;
-    }
-
-    @JsonProperty("readinessGates")
-    public void setReadinessGates(List<PodReadinessGate> readinessGates) {
-        this.readinessGates = readinessGates;
-    }
-
-    @JsonProperty("resourceClaims")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecResourceClaims> getResourceClaims() {
-        return resourceClaims;
-    }
-
-    @JsonProperty("resourceClaims")
-    public void setResourceClaims(List<ClusterServiceVersionSpecISpecDSpecTSpecResourceClaims> resourceClaims) {
-        this.resourceClaims = resourceClaims;
-    }
-
-    @JsonProperty("restartPolicy")
-    public String getRestartPolicy() {
-        return restartPolicy;
-    }
-
-    @JsonProperty("restartPolicy")
-    public void setRestartPolicy(String restartPolicy) {
-        this.restartPolicy = restartPolicy;
-    }
-
-    @JsonProperty("runtimeClassName")
-    public String getRuntimeClassName() {
-        return runtimeClassName;
-    }
-
-    @JsonProperty("runtimeClassName")
-    public void setRuntimeClassName(String runtimeClassName) {
-        this.runtimeClassName = runtimeClassName;
-    }
-
-    @JsonProperty("schedulerName")
-    public String getSchedulerName() {
-        return schedulerName;
-    }
-
-    @JsonProperty("schedulerName")
-    public void setSchedulerName(String schedulerName) {
-        this.schedulerName = schedulerName;
-    }
-
-    @JsonProperty("schedulingGates")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecSchedulingGates> getSchedulingGates() {
-        return schedulingGates;
-    }
-
-    @JsonProperty("schedulingGates")
-    public void setSchedulingGates(List<ClusterServiceVersionSpecISpecDSpecTSpecSchedulingGates> schedulingGates) {
-        this.schedulingGates = schedulingGates;
-    }
-
-    @JsonProperty("securityContext")
-    public ClusterServiceVersionSpecISpecDSpecTSpecSecurityContext getSecurityContext() {
-        return securityContext;
-    }
-
-    @JsonProperty("securityContext")
-    public void setSecurityContext(ClusterServiceVersionSpecISpecDSpecTSpecSecurityContext securityContext) {
-        this.securityContext = securityContext;
-    }
-
-    @JsonProperty("serviceAccount")
-    public String getServiceAccount() {
-        return serviceAccount;
-    }
-
-    @JsonProperty("serviceAccount")
-    public void setServiceAccount(String serviceAccount) {
-        this.serviceAccount = serviceAccount;
-    }
-
-    @JsonProperty("serviceAccountName")
-    public String getServiceAccountName() {
-        return serviceAccountName;
-    }
-
-    @JsonProperty("serviceAccountName")
-    public void setServiceAccountName(String serviceAccountName) {
-        this.serviceAccountName = serviceAccountName;
-    }
-
-    @JsonProperty("setHostnameAsFQDN")
-    public Boolean getSetHostnameAsFQDN() {
-        return setHostnameAsFQDN;
-    }
-
-    @JsonProperty("setHostnameAsFQDN")
-    public void setSetHostnameAsFQDN(Boolean setHostnameAsFQDN) {
-        this.setHostnameAsFQDN = setHostnameAsFQDN;
-    }
-
-    @JsonProperty("shareProcessNamespace")
-    public Boolean getShareProcessNamespace() {
-        return shareProcessNamespace;
-    }
-
-    @JsonProperty("shareProcessNamespace")
-    public void setShareProcessNamespace(Boolean shareProcessNamespace) {
-        this.shareProcessNamespace = shareProcessNamespace;
-    }
-
-    @JsonProperty("subdomain")
-    public String getSubdomain() {
-        return subdomain;
-    }
-
-    @JsonProperty("subdomain")
-    public void setSubdomain(String subdomain) {
-        this.subdomain = subdomain;
-    }
-
-    @JsonProperty("terminationGracePeriodSeconds")
-    public Long getTerminationGracePeriodSeconds() {
-        return terminationGracePeriodSeconds;
-    }
-
-    @JsonProperty("terminationGracePeriodSeconds")
-    public void setTerminationGracePeriodSeconds(Long terminationGracePeriodSeconds) {
-        this.terminationGracePeriodSeconds = terminationGracePeriodSeconds;
-    }
-
-    @JsonProperty("tolerations")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecTolerations> getTolerations() {
-        return tolerations;
-    }
-
-    @JsonProperty("tolerations")
-    public void setTolerations(List<ClusterServiceVersionSpecISpecDSpecTSpecTolerations> tolerations) {
-        this.tolerations = tolerations;
-    }
-
-    @JsonProperty("topologySpreadConstraints")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecTopologySpreadConstraints> getTopologySpreadConstraints() {
-        return topologySpreadConstraints;
-    }
-
-    @JsonProperty("topologySpreadConstraints")
-    public void setTopologySpreadConstraints(List<ClusterServiceVersionSpecISpecDSpecTSpecTopologySpreadConstraints> topologySpreadConstraints) {
-        this.topologySpreadConstraints = topologySpreadConstraints;
-    }
-
-    @JsonProperty("volumes")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecVolumes> getVolumes() {
-        return volumes;
-    }
-
-    @JsonProperty("volumes")
-    public void setVolumes(List<ClusterServiceVersionSpecISpecDSpecTSpecVolumes> volumes) {
-        this.volumes = volumes;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecANAPDSIDEPMatchExpressions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecANAPDSIDEPMatchExpressions.java
deleted file mode 100644
index 73e16741bc3..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecANAPDSIDEPMatchExpressions.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "operator",
-    "values"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecANAPDSIDEPMatchExpressions implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecANAPDSIDEPMatchExpressionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("operator")
-    private String operator;
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> values = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecANAPDSIDEPMatchExpressions() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecANAPDSIDEPMatchExpressions(String key, String operator, List<String> values) {
-        super();
-        this.key = key;
-        this.operator = operator;
-        this.values = values;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("operator")
-    public String getOperator() {
-        return operator;
-    }
-
-    @JsonProperty("operator")
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getValues() {
-        return values;
-    }
-
-    @JsonProperty("values")
-    public void setValues(List<String> values) {
-        this.values = values;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecANAPDSIDEPMatchExpressionsBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecANAPDSIDEPMatchExpressionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecANAPDSIDEPMatchExpressionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecANAPDSIDEPMatchFields.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecANAPDSIDEPMatchFields.java
deleted file mode 100644
index 4d891848914..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecANAPDSIDEPMatchFields.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "operator",
-    "values"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecANAPDSIDEPMatchFields implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecANAPDSIDEPMatchFieldsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("operator")
-    private String operator;
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> values = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecANAPDSIDEPMatchFields() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecANAPDSIDEPMatchFields(String key, String operator, List<String> values) {
-        super();
-        this.key = key;
-        this.operator = operator;
-        this.values = values;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("operator")
-    public String getOperator() {
-        return operator;
-    }
-
-    @JsonProperty("operator")
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getValues() {
-        return values;
-    }
-
-    @JsonProperty("values")
-    public void setValues(List<String> values) {
-        this.values = values;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecANAPDSIDEPMatchFieldsBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecANAPDSIDEPMatchFieldsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecANAPDSIDEPMatchFieldsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecANAPDSIDEPreference.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecANAPDSIDEPreference.java
deleted file mode 100644
index c49d39fa502..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecANAPDSIDEPreference.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "matchExpressions",
-    "matchFields"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecANAPDSIDEPreference implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecANAPDSIDEPreferenceBuilder> , KubernetesResource
-{
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecANAPDSIDEPMatchExpressions> matchExpressions = new ArrayList<>();
-    @JsonProperty("matchFields")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecANAPDSIDEPMatchFields> matchFields = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecANAPDSIDEPreference() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecANAPDSIDEPreference(List<ClusterServiceVersionSpecISpecDSpecTSpecANAPDSIDEPMatchExpressions> matchExpressions, List<ClusterServiceVersionSpecISpecDSpecTSpecANAPDSIDEPMatchFields> matchFields) {
-        super();
-        this.matchExpressions = matchExpressions;
-        this.matchFields = matchFields;
-    }
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecANAPDSIDEPMatchExpressions> getMatchExpressions() {
-        return matchExpressions;
-    }
-
-    @JsonProperty("matchExpressions")
-    public void setMatchExpressions(List<ClusterServiceVersionSpecISpecDSpecTSpecANAPDSIDEPMatchExpressions> matchExpressions) {
-        this.matchExpressions = matchExpressions;
-    }
-
-    @JsonProperty("matchFields")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecANAPDSIDEPMatchFields> getMatchFields() {
-        return matchFields;
-    }
-
-    @JsonProperty("matchFields")
-    public void setMatchFields(List<ClusterServiceVersionSpecISpecDSpecTSpecANAPDSIDEPMatchFields> matchFields) {
-        this.matchFields = matchFields;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecANAPDSIDEPreferenceBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecANAPDSIDEPreferenceBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecANAPDSIDEPreferenceBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecANAPreferredDuringSchedulingIgnoredDuringExecution.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecANAPreferredDuringSchedulingIgnoredDuringExecution.java
deleted file mode 100644
index 96f63dad65c..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecANAPreferredDuringSchedulingIgnoredDuringExecution.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "preference",
-    "weight"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecANAPreferredDuringSchedulingIgnoredDuringExecution implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecANAPreferredDuringSchedulingIgnoredDuringExecutionBuilder> , KubernetesResource
-{
-
-    @JsonProperty("preference")
-    private ClusterServiceVersionSpecISpecDSpecTSpecANAPDSIDEPreference preference;
-    @JsonProperty("weight")
-    private Integer weight;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecANAPreferredDuringSchedulingIgnoredDuringExecution() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecANAPreferredDuringSchedulingIgnoredDuringExecution(ClusterServiceVersionSpecISpecDSpecTSpecANAPDSIDEPreference preference, Integer weight) {
-        super();
-        this.preference = preference;
-        this.weight = weight;
-    }
-
-    @JsonProperty("preference")
-    public ClusterServiceVersionSpecISpecDSpecTSpecANAPDSIDEPreference getPreference() {
-        return preference;
-    }
-
-    @JsonProperty("preference")
-    public void setPreference(ClusterServiceVersionSpecISpecDSpecTSpecANAPDSIDEPreference preference) {
-        this.preference = preference;
-    }
-
-    @JsonProperty("weight")
-    public Integer getWeight() {
-        return weight;
-    }
-
-    @JsonProperty("weight")
-    public void setWeight(Integer weight) {
-        this.weight = weight;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecANAPreferredDuringSchedulingIgnoredDuringExecutionBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecANAPreferredDuringSchedulingIgnoredDuringExecutionBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecANAPreferredDuringSchedulingIgnoredDuringExecutionBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecANARDSIDENSTMatchExpressions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecANARDSIDENSTMatchExpressions.java
deleted file mode 100644
index c123f0cf2de..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecANARDSIDENSTMatchExpressions.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "operator",
-    "values"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecANARDSIDENSTMatchExpressions implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecANARDSIDENSTMatchExpressionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("operator")
-    private String operator;
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> values = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecANARDSIDENSTMatchExpressions() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecANARDSIDENSTMatchExpressions(String key, String operator, List<String> values) {
-        super();
-        this.key = key;
-        this.operator = operator;
-        this.values = values;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("operator")
-    public String getOperator() {
-        return operator;
-    }
-
-    @JsonProperty("operator")
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getValues() {
-        return values;
-    }
-
-    @JsonProperty("values")
-    public void setValues(List<String> values) {
-        this.values = values;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecANARDSIDENSTMatchExpressionsBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecANARDSIDENSTMatchExpressionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecANARDSIDENSTMatchExpressionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecANARDSIDENSTMatchFields.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecANARDSIDENSTMatchFields.java
deleted file mode 100644
index c0c7d2fcd05..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecANARDSIDENSTMatchFields.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "operator",
-    "values"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecANARDSIDENSTMatchFields implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecANARDSIDENSTMatchFieldsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("operator")
-    private String operator;
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> values = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecANARDSIDENSTMatchFields() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecANARDSIDENSTMatchFields(String key, String operator, List<String> values) {
-        super();
-        this.key = key;
-        this.operator = operator;
-        this.values = values;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("operator")
-    public String getOperator() {
-        return operator;
-    }
-
-    @JsonProperty("operator")
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getValues() {
-        return values;
-    }
-
-    @JsonProperty("values")
-    public void setValues(List<String> values) {
-        this.values = values;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecANARDSIDENSTMatchFieldsBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecANARDSIDENSTMatchFieldsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecANARDSIDENSTMatchFieldsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecANARDSIDENodeSelectorTerms.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecANARDSIDENodeSelectorTerms.java
deleted file mode 100644
index e91d6927ad6..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecANARDSIDENodeSelectorTerms.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "matchExpressions",
-    "matchFields"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecANARDSIDENodeSelectorTerms implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecANARDSIDENodeSelectorTermsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecANARDSIDENSTMatchExpressions> matchExpressions = new ArrayList<>();
-    @JsonProperty("matchFields")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecANARDSIDENSTMatchFields> matchFields = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecANARDSIDENodeSelectorTerms() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecANARDSIDENodeSelectorTerms(List<ClusterServiceVersionSpecISpecDSpecTSpecANARDSIDENSTMatchExpressions> matchExpressions, List<ClusterServiceVersionSpecISpecDSpecTSpecANARDSIDENSTMatchFields> matchFields) {
-        super();
-        this.matchExpressions = matchExpressions;
-        this.matchFields = matchFields;
-    }
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecANARDSIDENSTMatchExpressions> getMatchExpressions() {
-        return matchExpressions;
-    }
-
-    @JsonProperty("matchExpressions")
-    public void setMatchExpressions(List<ClusterServiceVersionSpecISpecDSpecTSpecANARDSIDENSTMatchExpressions> matchExpressions) {
-        this.matchExpressions = matchExpressions;
-    }
-
-    @JsonProperty("matchFields")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecANARDSIDENSTMatchFields> getMatchFields() {
-        return matchFields;
-    }
-
-    @JsonProperty("matchFields")
-    public void setMatchFields(List<ClusterServiceVersionSpecISpecDSpecTSpecANARDSIDENSTMatchFields> matchFields) {
-        this.matchFields = matchFields;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecANARDSIDENodeSelectorTermsBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecANARDSIDENodeSelectorTermsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecANARDSIDENodeSelectorTermsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecANARequiredDuringSchedulingIgnoredDuringExecution.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecANARequiredDuringSchedulingIgnoredDuringExecution.java
deleted file mode 100644
index 950cb20c8f6..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecANARequiredDuringSchedulingIgnoredDuringExecution.java
+++ /dev/null
@@ -1,112 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "nodeSelectorTerms"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecANARequiredDuringSchedulingIgnoredDuringExecution implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecANARequiredDuringSchedulingIgnoredDuringExecutionBuilder> , KubernetesResource
-{
-
-    @JsonProperty("nodeSelectorTerms")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecANARDSIDENodeSelectorTerms> nodeSelectorTerms = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecANARequiredDuringSchedulingIgnoredDuringExecution() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecANARequiredDuringSchedulingIgnoredDuringExecution(List<ClusterServiceVersionSpecISpecDSpecTSpecANARDSIDENodeSelectorTerms> nodeSelectorTerms) {
-        super();
-        this.nodeSelectorTerms = nodeSelectorTerms;
-    }
-
-    @JsonProperty("nodeSelectorTerms")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecANARDSIDENodeSelectorTerms> getNodeSelectorTerms() {
-        return nodeSelectorTerms;
-    }
-
-    @JsonProperty("nodeSelectorTerms")
-    public void setNodeSelectorTerms(List<ClusterServiceVersionSpecISpecDSpecTSpecANARDSIDENodeSelectorTerms> nodeSelectorTerms) {
-        this.nodeSelectorTerms = nodeSelectorTerms;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecANARequiredDuringSchedulingIgnoredDuringExecutionBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecANARequiredDuringSchedulingIgnoredDuringExecutionBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecANARequiredDuringSchedulingIgnoredDuringExecutionBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecANodeAffinity.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecANodeAffinity.java
deleted file mode 100644
index cfa80e4a616..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecANodeAffinity.java
+++ /dev/null
@@ -1,126 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "preferredDuringSchedulingIgnoredDuringExecution",
-    "requiredDuringSchedulingIgnoredDuringExecution"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecANodeAffinity implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecANodeAffinityBuilder> , KubernetesResource
-{
-
-    @JsonProperty("preferredDuringSchedulingIgnoredDuringExecution")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecANAPreferredDuringSchedulingIgnoredDuringExecution> preferredDuringSchedulingIgnoredDuringExecution = new ArrayList<>();
-    @JsonProperty("requiredDuringSchedulingIgnoredDuringExecution")
-    private ClusterServiceVersionSpecISpecDSpecTSpecANARequiredDuringSchedulingIgnoredDuringExecution requiredDuringSchedulingIgnoredDuringExecution;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecANodeAffinity() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecANodeAffinity(List<ClusterServiceVersionSpecISpecDSpecTSpecANAPreferredDuringSchedulingIgnoredDuringExecution> preferredDuringSchedulingIgnoredDuringExecution, ClusterServiceVersionSpecISpecDSpecTSpecANARequiredDuringSchedulingIgnoredDuringExecution requiredDuringSchedulingIgnoredDuringExecution) {
-        super();
-        this.preferredDuringSchedulingIgnoredDuringExecution = preferredDuringSchedulingIgnoredDuringExecution;
-        this.requiredDuringSchedulingIgnoredDuringExecution = requiredDuringSchedulingIgnoredDuringExecution;
-    }
-
-    @JsonProperty("preferredDuringSchedulingIgnoredDuringExecution")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecANAPreferredDuringSchedulingIgnoredDuringExecution> getPreferredDuringSchedulingIgnoredDuringExecution() {
-        return preferredDuringSchedulingIgnoredDuringExecution;
-    }
-
-    @JsonProperty("preferredDuringSchedulingIgnoredDuringExecution")
-    public void setPreferredDuringSchedulingIgnoredDuringExecution(List<ClusterServiceVersionSpecISpecDSpecTSpecANAPreferredDuringSchedulingIgnoredDuringExecution> preferredDuringSchedulingIgnoredDuringExecution) {
-        this.preferredDuringSchedulingIgnoredDuringExecution = preferredDuringSchedulingIgnoredDuringExecution;
-    }
-
-    @JsonProperty("requiredDuringSchedulingIgnoredDuringExecution")
-    public ClusterServiceVersionSpecISpecDSpecTSpecANARequiredDuringSchedulingIgnoredDuringExecution getRequiredDuringSchedulingIgnoredDuringExecution() {
-        return requiredDuringSchedulingIgnoredDuringExecution;
-    }
-
-    @JsonProperty("requiredDuringSchedulingIgnoredDuringExecution")
-    public void setRequiredDuringSchedulingIgnoredDuringExecution(ClusterServiceVersionSpecISpecDSpecTSpecANARequiredDuringSchedulingIgnoredDuringExecution requiredDuringSchedulingIgnoredDuringExecution) {
-        this.requiredDuringSchedulingIgnoredDuringExecution = requiredDuringSchedulingIgnoredDuringExecution;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecANodeAffinityBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecANodeAffinityBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecANodeAffinityBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATLSMatchExpressions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATLSMatchExpressions.java
deleted file mode 100644
index 85dff41015e..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATLSMatchExpressions.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "operator",
-    "values"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATLSMatchExpressions implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATLSMatchExpressionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("operator")
-    private String operator;
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> values = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATLSMatchExpressions() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATLSMatchExpressions(String key, String operator, List<String> values) {
-        super();
-        this.key = key;
-        this.operator = operator;
-        this.values = values;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("operator")
-    public String getOperator() {
-        return operator;
-    }
-
-    @JsonProperty("operator")
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getValues() {
-        return values;
-    }
-
-    @JsonProperty("values")
-    public void setValues(List<String> values) {
-        this.values = values;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATLSMatchExpressionsBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATLSMatchExpressionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATLSMatchExpressionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATLabelSelector.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATLabelSelector.java
deleted file mode 100644
index 459bbe24d58..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATLabelSelector.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "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 ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATLabelSelector implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATLabelSelectorBuilder> , KubernetesResource
-{
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATLSMatchExpressions> matchExpressions = new ArrayList<>();
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, String> matchLabels = new LinkedHashMap<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATLabelSelector() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATLabelSelector(List<ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATLSMatchExpressions> matchExpressions, Map<String, String> matchLabels) {
-        super();
-        this.matchExpressions = matchExpressions;
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATLSMatchExpressions> getMatchExpressions() {
-        return matchExpressions;
-    }
-
-    @JsonProperty("matchExpressions")
-    public void setMatchExpressions(List<ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATLSMatchExpressions> matchExpressions) {
-        this.matchExpressions = matchExpressions;
-    }
-
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, String> getMatchLabels() {
-        return matchLabels;
-    }
-
-    @JsonProperty("matchLabels")
-    public void setMatchLabels(Map<String, String> matchLabels) {
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATLabelSelectorBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATLabelSelectorBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATLabelSelectorBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATNSMatchExpressions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATNSMatchExpressions.java
deleted file mode 100644
index 79472d87b52..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATNSMatchExpressions.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "operator",
-    "values"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATNSMatchExpressions implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATNSMatchExpressionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("operator")
-    private String operator;
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> values = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATNSMatchExpressions() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATNSMatchExpressions(String key, String operator, List<String> values) {
-        super();
-        this.key = key;
-        this.operator = operator;
-        this.values = values;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("operator")
-    public String getOperator() {
-        return operator;
-    }
-
-    @JsonProperty("operator")
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getValues() {
-        return values;
-    }
-
-    @JsonProperty("values")
-    public void setValues(List<String> values) {
-        this.values = values;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATNSMatchExpressionsBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATNSMatchExpressionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATNSMatchExpressionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATNamespaceSelector.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATNamespaceSelector.java
deleted file mode 100644
index 96c76e84ffc..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATNamespaceSelector.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "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 ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATNamespaceSelector implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATNamespaceSelectorBuilder> , KubernetesResource
-{
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATNSMatchExpressions> matchExpressions = new ArrayList<>();
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, String> matchLabels = new LinkedHashMap<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATNamespaceSelector() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATNamespaceSelector(List<ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATNSMatchExpressions> matchExpressions, Map<String, String> matchLabels) {
-        super();
-        this.matchExpressions = matchExpressions;
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATNSMatchExpressions> getMatchExpressions() {
-        return matchExpressions;
-    }
-
-    @JsonProperty("matchExpressions")
-    public void setMatchExpressions(List<ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATNSMatchExpressions> matchExpressions) {
-        this.matchExpressions = matchExpressions;
-    }
-
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, String> getMatchLabels() {
-        return matchLabels;
-    }
-
-    @JsonProperty("matchLabels")
-    public void setMatchLabels(Map<String, String> matchLabels) {
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATNamespaceSelectorBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATNamespaceSelectorBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATNamespaceSelectorBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPodAffinityTerm.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPodAffinityTerm.java
deleted file mode 100644
index 518af300b58..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPodAffinityTerm.java
+++ /dev/null
@@ -1,186 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "labelSelector",
-    "matchLabelKeys",
-    "mismatchLabelKeys",
-    "namespaceSelector",
-    "namespaces",
-    "topologyKey"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPodAffinityTerm implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPodAffinityTermBuilder> , KubernetesResource
-{
-
-    @JsonProperty("labelSelector")
-    private ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATLabelSelector labelSelector;
-    @JsonProperty("matchLabelKeys")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> matchLabelKeys = new ArrayList<>();
-    @JsonProperty("mismatchLabelKeys")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> mismatchLabelKeys = new ArrayList<>();
-    @JsonProperty("namespaceSelector")
-    private ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATNamespaceSelector namespaceSelector;
-    @JsonProperty("namespaces")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> namespaces = new ArrayList<>();
-    @JsonProperty("topologyKey")
-    private String topologyKey;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPodAffinityTerm() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPodAffinityTerm(ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATLabelSelector labelSelector, List<String> matchLabelKeys, List<String> mismatchLabelKeys, ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATNamespaceSelector namespaceSelector, List<String> namespaces, String topologyKey) {
-        super();
-        this.labelSelector = labelSelector;
-        this.matchLabelKeys = matchLabelKeys;
-        this.mismatchLabelKeys = mismatchLabelKeys;
-        this.namespaceSelector = namespaceSelector;
-        this.namespaces = namespaces;
-        this.topologyKey = topologyKey;
-    }
-
-    @JsonProperty("labelSelector")
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATLabelSelector getLabelSelector() {
-        return labelSelector;
-    }
-
-    @JsonProperty("labelSelector")
-    public void setLabelSelector(ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATLabelSelector labelSelector) {
-        this.labelSelector = labelSelector;
-    }
-
-    @JsonProperty("matchLabelKeys")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getMatchLabelKeys() {
-        return matchLabelKeys;
-    }
-
-    @JsonProperty("matchLabelKeys")
-    public void setMatchLabelKeys(List<String> matchLabelKeys) {
-        this.matchLabelKeys = matchLabelKeys;
-    }
-
-    @JsonProperty("mismatchLabelKeys")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getMismatchLabelKeys() {
-        return mismatchLabelKeys;
-    }
-
-    @JsonProperty("mismatchLabelKeys")
-    public void setMismatchLabelKeys(List<String> mismatchLabelKeys) {
-        this.mismatchLabelKeys = mismatchLabelKeys;
-    }
-
-    @JsonProperty("namespaceSelector")
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATNamespaceSelector getNamespaceSelector() {
-        return namespaceSelector;
-    }
-
-    @JsonProperty("namespaceSelector")
-    public void setNamespaceSelector(ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPATNamespaceSelector namespaceSelector) {
-        this.namespaceSelector = namespaceSelector;
-    }
-
-    @JsonProperty("namespaces")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getNamespaces() {
-        return namespaces;
-    }
-
-    @JsonProperty("namespaces")
-    public void setNamespaces(List<String> namespaces) {
-        this.namespaces = namespaces;
-    }
-
-    @JsonProperty("topologyKey")
-    public String getTopologyKey() {
-        return topologyKey;
-    }
-
-    @JsonProperty("topologyKey")
-    public void setTopologyKey(String topologyKey) {
-        this.topologyKey = topologyKey;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPodAffinityTermBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPodAffinityTermBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPodAffinityTermBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPAAPreferredDuringSchedulingIgnoredDuringExecution.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPAAPreferredDuringSchedulingIgnoredDuringExecution.java
deleted file mode 100644
index 7062cf7c122..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPAAPreferredDuringSchedulingIgnoredDuringExecution.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "podAffinityTerm",
-    "weight"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecAPAAPreferredDuringSchedulingIgnoredDuringExecution implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecAPAAPreferredDuringSchedulingIgnoredDuringExecutionBuilder> , KubernetesResource
-{
-
-    @JsonProperty("podAffinityTerm")
-    private ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPodAffinityTerm podAffinityTerm;
-    @JsonProperty("weight")
-    private Integer weight;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAAPreferredDuringSchedulingIgnoredDuringExecution() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAAPreferredDuringSchedulingIgnoredDuringExecution(ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPodAffinityTerm podAffinityTerm, Integer weight) {
-        super();
-        this.podAffinityTerm = podAffinityTerm;
-        this.weight = weight;
-    }
-
-    @JsonProperty("podAffinityTerm")
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPodAffinityTerm getPodAffinityTerm() {
-        return podAffinityTerm;
-    }
-
-    @JsonProperty("podAffinityTerm")
-    public void setPodAffinityTerm(ClusterServiceVersionSpecISpecDSpecTSpecAPAAPDSIDEPodAffinityTerm podAffinityTerm) {
-        this.podAffinityTerm = podAffinityTerm;
-    }
-
-    @JsonProperty("weight")
-    public Integer getWeight() {
-        return weight;
-    }
-
-    @JsonProperty("weight")
-    public void setWeight(Integer weight) {
-        this.weight = weight;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAAPreferredDuringSchedulingIgnoredDuringExecutionBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecAPAAPreferredDuringSchedulingIgnoredDuringExecutionBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAAPreferredDuringSchedulingIgnoredDuringExecutionBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDELSMatchExpressions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDELSMatchExpressions.java
deleted file mode 100644
index e39ff039260..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDELSMatchExpressions.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "operator",
-    "values"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDELSMatchExpressions implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDELSMatchExpressionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("operator")
-    private String operator;
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> values = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDELSMatchExpressions() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDELSMatchExpressions(String key, String operator, List<String> values) {
-        super();
-        this.key = key;
-        this.operator = operator;
-        this.values = values;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("operator")
-    public String getOperator() {
-        return operator;
-    }
-
-    @JsonProperty("operator")
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getValues() {
-        return values;
-    }
-
-    @JsonProperty("values")
-    public void setValues(List<String> values) {
-        this.values = values;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDELSMatchExpressionsBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDELSMatchExpressionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDELSMatchExpressionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDELabelSelector.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDELabelSelector.java
deleted file mode 100644
index bc90a651360..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDELabelSelector.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "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 ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDELabelSelector implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDELabelSelectorBuilder> , KubernetesResource
-{
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDELSMatchExpressions> matchExpressions = new ArrayList<>();
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, String> matchLabels = new LinkedHashMap<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDELabelSelector() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDELabelSelector(List<ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDELSMatchExpressions> matchExpressions, Map<String, String> matchLabels) {
-        super();
-        this.matchExpressions = matchExpressions;
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDELSMatchExpressions> getMatchExpressions() {
-        return matchExpressions;
-    }
-
-    @JsonProperty("matchExpressions")
-    public void setMatchExpressions(List<ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDELSMatchExpressions> matchExpressions) {
-        this.matchExpressions = matchExpressions;
-    }
-
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, String> getMatchLabels() {
-        return matchLabels;
-    }
-
-    @JsonProperty("matchLabels")
-    public void setMatchLabels(Map<String, String> matchLabels) {
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDELabelSelectorBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDELabelSelectorBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDELabelSelectorBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDENSMatchExpressions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDENSMatchExpressions.java
deleted file mode 100644
index d864f6ac817..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDENSMatchExpressions.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "operator",
-    "values"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDENSMatchExpressions implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDENSMatchExpressionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("operator")
-    private String operator;
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> values = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDENSMatchExpressions() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDENSMatchExpressions(String key, String operator, List<String> values) {
-        super();
-        this.key = key;
-        this.operator = operator;
-        this.values = values;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("operator")
-    public String getOperator() {
-        return operator;
-    }
-
-    @JsonProperty("operator")
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getValues() {
-        return values;
-    }
-
-    @JsonProperty("values")
-    public void setValues(List<String> values) {
-        this.values = values;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDENSMatchExpressionsBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDENSMatchExpressionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDENSMatchExpressionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDENamespaceSelector.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDENamespaceSelector.java
deleted file mode 100644
index 22607ca25cd..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDENamespaceSelector.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "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 ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDENamespaceSelector implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDENamespaceSelectorBuilder> , KubernetesResource
-{
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDENSMatchExpressions> matchExpressions = new ArrayList<>();
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, String> matchLabels = new LinkedHashMap<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDENamespaceSelector() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDENamespaceSelector(List<ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDENSMatchExpressions> matchExpressions, Map<String, String> matchLabels) {
-        super();
-        this.matchExpressions = matchExpressions;
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDENSMatchExpressions> getMatchExpressions() {
-        return matchExpressions;
-    }
-
-    @JsonProperty("matchExpressions")
-    public void setMatchExpressions(List<ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDENSMatchExpressions> matchExpressions) {
-        this.matchExpressions = matchExpressions;
-    }
-
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, String> getMatchLabels() {
-        return matchLabels;
-    }
-
-    @JsonProperty("matchLabels")
-    public void setMatchLabels(Map<String, String> matchLabels) {
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDENamespaceSelectorBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDENamespaceSelectorBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDENamespaceSelectorBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPAARequiredDuringSchedulingIgnoredDuringExecution.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPAARequiredDuringSchedulingIgnoredDuringExecution.java
deleted file mode 100644
index 137ff69a47b..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPAARequiredDuringSchedulingIgnoredDuringExecution.java
+++ /dev/null
@@ -1,186 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "labelSelector",
-    "matchLabelKeys",
-    "mismatchLabelKeys",
-    "namespaceSelector",
-    "namespaces",
-    "topologyKey"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecAPAARequiredDuringSchedulingIgnoredDuringExecution implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecAPAARequiredDuringSchedulingIgnoredDuringExecutionBuilder> , KubernetesResource
-{
-
-    @JsonProperty("labelSelector")
-    private ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDELabelSelector labelSelector;
-    @JsonProperty("matchLabelKeys")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> matchLabelKeys = new ArrayList<>();
-    @JsonProperty("mismatchLabelKeys")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> mismatchLabelKeys = new ArrayList<>();
-    @JsonProperty("namespaceSelector")
-    private ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDENamespaceSelector namespaceSelector;
-    @JsonProperty("namespaces")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> namespaces = new ArrayList<>();
-    @JsonProperty("topologyKey")
-    private String topologyKey;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAARequiredDuringSchedulingIgnoredDuringExecution() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAARequiredDuringSchedulingIgnoredDuringExecution(ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDELabelSelector labelSelector, List<String> matchLabelKeys, List<String> mismatchLabelKeys, ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDENamespaceSelector namespaceSelector, List<String> namespaces, String topologyKey) {
-        super();
-        this.labelSelector = labelSelector;
-        this.matchLabelKeys = matchLabelKeys;
-        this.mismatchLabelKeys = mismatchLabelKeys;
-        this.namespaceSelector = namespaceSelector;
-        this.namespaces = namespaces;
-        this.topologyKey = topologyKey;
-    }
-
-    @JsonProperty("labelSelector")
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDELabelSelector getLabelSelector() {
-        return labelSelector;
-    }
-
-    @JsonProperty("labelSelector")
-    public void setLabelSelector(ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDELabelSelector labelSelector) {
-        this.labelSelector = labelSelector;
-    }
-
-    @JsonProperty("matchLabelKeys")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getMatchLabelKeys() {
-        return matchLabelKeys;
-    }
-
-    @JsonProperty("matchLabelKeys")
-    public void setMatchLabelKeys(List<String> matchLabelKeys) {
-        this.matchLabelKeys = matchLabelKeys;
-    }
-
-    @JsonProperty("mismatchLabelKeys")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getMismatchLabelKeys() {
-        return mismatchLabelKeys;
-    }
-
-    @JsonProperty("mismatchLabelKeys")
-    public void setMismatchLabelKeys(List<String> mismatchLabelKeys) {
-        this.mismatchLabelKeys = mismatchLabelKeys;
-    }
-
-    @JsonProperty("namespaceSelector")
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDENamespaceSelector getNamespaceSelector() {
-        return namespaceSelector;
-    }
-
-    @JsonProperty("namespaceSelector")
-    public void setNamespaceSelector(ClusterServiceVersionSpecISpecDSpecTSpecAPAARDSIDENamespaceSelector namespaceSelector) {
-        this.namespaceSelector = namespaceSelector;
-    }
-
-    @JsonProperty("namespaces")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getNamespaces() {
-        return namespaces;
-    }
-
-    @JsonProperty("namespaces")
-    public void setNamespaces(List<String> namespaces) {
-        this.namespaces = namespaces;
-    }
-
-    @JsonProperty("topologyKey")
-    public String getTopologyKey() {
-        return topologyKey;
-    }
-
-    @JsonProperty("topologyKey")
-    public void setTopologyKey(String topologyKey) {
-        this.topologyKey = topologyKey;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAARequiredDuringSchedulingIgnoredDuringExecutionBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecAPAARequiredDuringSchedulingIgnoredDuringExecutionBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAARequiredDuringSchedulingIgnoredDuringExecutionBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATLSMatchExpressions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATLSMatchExpressions.java
deleted file mode 100644
index bf8b9a6a9fa..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATLSMatchExpressions.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "operator",
-    "values"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATLSMatchExpressions implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATLSMatchExpressionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("operator")
-    private String operator;
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> values = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATLSMatchExpressions() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATLSMatchExpressions(String key, String operator, List<String> values) {
-        super();
-        this.key = key;
-        this.operator = operator;
-        this.values = values;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("operator")
-    public String getOperator() {
-        return operator;
-    }
-
-    @JsonProperty("operator")
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getValues() {
-        return values;
-    }
-
-    @JsonProperty("values")
-    public void setValues(List<String> values) {
-        this.values = values;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATLSMatchExpressionsBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATLSMatchExpressionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATLSMatchExpressionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATLabelSelector.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATLabelSelector.java
deleted file mode 100644
index 793fcc4d512..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATLabelSelector.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "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 ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATLabelSelector implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATLabelSelectorBuilder> , KubernetesResource
-{
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATLSMatchExpressions> matchExpressions = new ArrayList<>();
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, String> matchLabels = new LinkedHashMap<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATLabelSelector() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATLabelSelector(List<ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATLSMatchExpressions> matchExpressions, Map<String, String> matchLabels) {
-        super();
-        this.matchExpressions = matchExpressions;
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATLSMatchExpressions> getMatchExpressions() {
-        return matchExpressions;
-    }
-
-    @JsonProperty("matchExpressions")
-    public void setMatchExpressions(List<ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATLSMatchExpressions> matchExpressions) {
-        this.matchExpressions = matchExpressions;
-    }
-
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, String> getMatchLabels() {
-        return matchLabels;
-    }
-
-    @JsonProperty("matchLabels")
-    public void setMatchLabels(Map<String, String> matchLabels) {
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATLabelSelectorBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATLabelSelectorBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATLabelSelectorBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATNSMatchExpressions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATNSMatchExpressions.java
deleted file mode 100644
index 43f0a234553..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATNSMatchExpressions.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "operator",
-    "values"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATNSMatchExpressions implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATNSMatchExpressionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("operator")
-    private String operator;
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> values = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATNSMatchExpressions() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATNSMatchExpressions(String key, String operator, List<String> values) {
-        super();
-        this.key = key;
-        this.operator = operator;
-        this.values = values;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("operator")
-    public String getOperator() {
-        return operator;
-    }
-
-    @JsonProperty("operator")
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getValues() {
-        return values;
-    }
-
-    @JsonProperty("values")
-    public void setValues(List<String> values) {
-        this.values = values;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATNSMatchExpressionsBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATNSMatchExpressionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATNSMatchExpressionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATNamespaceSelector.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATNamespaceSelector.java
deleted file mode 100644
index 507fcbf7980..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATNamespaceSelector.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "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 ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATNamespaceSelector implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATNamespaceSelectorBuilder> , KubernetesResource
-{
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATNSMatchExpressions> matchExpressions = new ArrayList<>();
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, String> matchLabels = new LinkedHashMap<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATNamespaceSelector() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATNamespaceSelector(List<ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATNSMatchExpressions> matchExpressions, Map<String, String> matchLabels) {
-        super();
-        this.matchExpressions = matchExpressions;
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATNSMatchExpressions> getMatchExpressions() {
-        return matchExpressions;
-    }
-
-    @JsonProperty("matchExpressions")
-    public void setMatchExpressions(List<ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATNSMatchExpressions> matchExpressions) {
-        this.matchExpressions = matchExpressions;
-    }
-
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, String> getMatchLabels() {
-        return matchLabels;
-    }
-
-    @JsonProperty("matchLabels")
-    public void setMatchLabels(Map<String, String> matchLabels) {
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATNamespaceSelectorBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATNamespaceSelectorBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATNamespaceSelectorBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPodAffinityTerm.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPodAffinityTerm.java
deleted file mode 100644
index f79aa016359..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPodAffinityTerm.java
+++ /dev/null
@@ -1,186 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "labelSelector",
-    "matchLabelKeys",
-    "mismatchLabelKeys",
-    "namespaceSelector",
-    "namespaces",
-    "topologyKey"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPodAffinityTerm implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPodAffinityTermBuilder> , KubernetesResource
-{
-
-    @JsonProperty("labelSelector")
-    private ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATLabelSelector labelSelector;
-    @JsonProperty("matchLabelKeys")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> matchLabelKeys = new ArrayList<>();
-    @JsonProperty("mismatchLabelKeys")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> mismatchLabelKeys = new ArrayList<>();
-    @JsonProperty("namespaceSelector")
-    private ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATNamespaceSelector namespaceSelector;
-    @JsonProperty("namespaces")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> namespaces = new ArrayList<>();
-    @JsonProperty("topologyKey")
-    private String topologyKey;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPodAffinityTerm() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPodAffinityTerm(ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATLabelSelector labelSelector, List<String> matchLabelKeys, List<String> mismatchLabelKeys, ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATNamespaceSelector namespaceSelector, List<String> namespaces, String topologyKey) {
-        super();
-        this.labelSelector = labelSelector;
-        this.matchLabelKeys = matchLabelKeys;
-        this.mismatchLabelKeys = mismatchLabelKeys;
-        this.namespaceSelector = namespaceSelector;
-        this.namespaces = namespaces;
-        this.topologyKey = topologyKey;
-    }
-
-    @JsonProperty("labelSelector")
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATLabelSelector getLabelSelector() {
-        return labelSelector;
-    }
-
-    @JsonProperty("labelSelector")
-    public void setLabelSelector(ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATLabelSelector labelSelector) {
-        this.labelSelector = labelSelector;
-    }
-
-    @JsonProperty("matchLabelKeys")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getMatchLabelKeys() {
-        return matchLabelKeys;
-    }
-
-    @JsonProperty("matchLabelKeys")
-    public void setMatchLabelKeys(List<String> matchLabelKeys) {
-        this.matchLabelKeys = matchLabelKeys;
-    }
-
-    @JsonProperty("mismatchLabelKeys")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getMismatchLabelKeys() {
-        return mismatchLabelKeys;
-    }
-
-    @JsonProperty("mismatchLabelKeys")
-    public void setMismatchLabelKeys(List<String> mismatchLabelKeys) {
-        this.mismatchLabelKeys = mismatchLabelKeys;
-    }
-
-    @JsonProperty("namespaceSelector")
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATNamespaceSelector getNamespaceSelector() {
-        return namespaceSelector;
-    }
-
-    @JsonProperty("namespaceSelector")
-    public void setNamespaceSelector(ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPATNamespaceSelector namespaceSelector) {
-        this.namespaceSelector = namespaceSelector;
-    }
-
-    @JsonProperty("namespaces")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getNamespaces() {
-        return namespaces;
-    }
-
-    @JsonProperty("namespaces")
-    public void setNamespaces(List<String> namespaces) {
-        this.namespaces = namespaces;
-    }
-
-    @JsonProperty("topologyKey")
-    public String getTopologyKey() {
-        return topologyKey;
-    }
-
-    @JsonProperty("topologyKey")
-    public void setTopologyKey(String topologyKey) {
-        this.topologyKey = topologyKey;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPodAffinityTermBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPodAffinityTermBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPodAffinityTermBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPAPreferredDuringSchedulingIgnoredDuringExecution.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPAPreferredDuringSchedulingIgnoredDuringExecution.java
deleted file mode 100644
index d10ee9da3f3..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPAPreferredDuringSchedulingIgnoredDuringExecution.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "podAffinityTerm",
-    "weight"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecAPAPreferredDuringSchedulingIgnoredDuringExecution implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecAPAPreferredDuringSchedulingIgnoredDuringExecutionBuilder> , KubernetesResource
-{
-
-    @JsonProperty("podAffinityTerm")
-    private ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPodAffinityTerm podAffinityTerm;
-    @JsonProperty("weight")
-    private Integer weight;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAPreferredDuringSchedulingIgnoredDuringExecution() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAPreferredDuringSchedulingIgnoredDuringExecution(ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPodAffinityTerm podAffinityTerm, Integer weight) {
-        super();
-        this.podAffinityTerm = podAffinityTerm;
-        this.weight = weight;
-    }
-
-    @JsonProperty("podAffinityTerm")
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPodAffinityTerm getPodAffinityTerm() {
-        return podAffinityTerm;
-    }
-
-    @JsonProperty("podAffinityTerm")
-    public void setPodAffinityTerm(ClusterServiceVersionSpecISpecDSpecTSpecAPAPDSIDEPodAffinityTerm podAffinityTerm) {
-        this.podAffinityTerm = podAffinityTerm;
-    }
-
-    @JsonProperty("weight")
-    public Integer getWeight() {
-        return weight;
-    }
-
-    @JsonProperty("weight")
-    public void setWeight(Integer weight) {
-        this.weight = weight;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAPreferredDuringSchedulingIgnoredDuringExecutionBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecAPAPreferredDuringSchedulingIgnoredDuringExecutionBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPAPreferredDuringSchedulingIgnoredDuringExecutionBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDELSMatchExpressions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDELSMatchExpressions.java
deleted file mode 100644
index c11d66049d7..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDELSMatchExpressions.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "operator",
-    "values"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDELSMatchExpressions implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDELSMatchExpressionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("operator")
-    private String operator;
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> values = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDELSMatchExpressions() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDELSMatchExpressions(String key, String operator, List<String> values) {
-        super();
-        this.key = key;
-        this.operator = operator;
-        this.values = values;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("operator")
-    public String getOperator() {
-        return operator;
-    }
-
-    @JsonProperty("operator")
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getValues() {
-        return values;
-    }
-
-    @JsonProperty("values")
-    public void setValues(List<String> values) {
-        this.values = values;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDELSMatchExpressionsBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDELSMatchExpressionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDELSMatchExpressionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDELabelSelector.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDELabelSelector.java
deleted file mode 100644
index 76ae01f32ee..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDELabelSelector.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "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 ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDELabelSelector implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDELabelSelectorBuilder> , KubernetesResource
-{
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDELSMatchExpressions> matchExpressions = new ArrayList<>();
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, String> matchLabels = new LinkedHashMap<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDELabelSelector() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDELabelSelector(List<ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDELSMatchExpressions> matchExpressions, Map<String, String> matchLabels) {
-        super();
-        this.matchExpressions = matchExpressions;
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDELSMatchExpressions> getMatchExpressions() {
-        return matchExpressions;
-    }
-
-    @JsonProperty("matchExpressions")
-    public void setMatchExpressions(List<ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDELSMatchExpressions> matchExpressions) {
-        this.matchExpressions = matchExpressions;
-    }
-
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, String> getMatchLabels() {
-        return matchLabels;
-    }
-
-    @JsonProperty("matchLabels")
-    public void setMatchLabels(Map<String, String> matchLabels) {
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDELabelSelectorBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDELabelSelectorBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDELabelSelectorBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDENSMatchExpressions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDENSMatchExpressions.java
deleted file mode 100644
index bb4678b4cb4..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDENSMatchExpressions.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "operator",
-    "values"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDENSMatchExpressions implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDENSMatchExpressionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("operator")
-    private String operator;
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> values = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDENSMatchExpressions() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDENSMatchExpressions(String key, String operator, List<String> values) {
-        super();
-        this.key = key;
-        this.operator = operator;
-        this.values = values;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("operator")
-    public String getOperator() {
-        return operator;
-    }
-
-    @JsonProperty("operator")
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getValues() {
-        return values;
-    }
-
-    @JsonProperty("values")
-    public void setValues(List<String> values) {
-        this.values = values;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDENSMatchExpressionsBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDENSMatchExpressionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDENSMatchExpressionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDENamespaceSelector.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDENamespaceSelector.java
deleted file mode 100644
index e3b767f79e6..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDENamespaceSelector.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "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 ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDENamespaceSelector implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDENamespaceSelectorBuilder> , KubernetesResource
-{
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDENSMatchExpressions> matchExpressions = new ArrayList<>();
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, String> matchLabels = new LinkedHashMap<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDENamespaceSelector() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDENamespaceSelector(List<ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDENSMatchExpressions> matchExpressions, Map<String, String> matchLabels) {
-        super();
-        this.matchExpressions = matchExpressions;
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDENSMatchExpressions> getMatchExpressions() {
-        return matchExpressions;
-    }
-
-    @JsonProperty("matchExpressions")
-    public void setMatchExpressions(List<ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDENSMatchExpressions> matchExpressions) {
-        this.matchExpressions = matchExpressions;
-    }
-
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, String> getMatchLabels() {
-        return matchLabels;
-    }
-
-    @JsonProperty("matchLabels")
-    public void setMatchLabels(Map<String, String> matchLabels) {
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDENamespaceSelectorBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDENamespaceSelectorBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDENamespaceSelectorBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPARequiredDuringSchedulingIgnoredDuringExecution.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPARequiredDuringSchedulingIgnoredDuringExecution.java
deleted file mode 100644
index 3f797533e46..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPARequiredDuringSchedulingIgnoredDuringExecution.java
+++ /dev/null
@@ -1,186 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "labelSelector",
-    "matchLabelKeys",
-    "mismatchLabelKeys",
-    "namespaceSelector",
-    "namespaces",
-    "topologyKey"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecAPARequiredDuringSchedulingIgnoredDuringExecution implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecAPARequiredDuringSchedulingIgnoredDuringExecutionBuilder> , KubernetesResource
-{
-
-    @JsonProperty("labelSelector")
-    private ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDELabelSelector labelSelector;
-    @JsonProperty("matchLabelKeys")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> matchLabelKeys = new ArrayList<>();
-    @JsonProperty("mismatchLabelKeys")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> mismatchLabelKeys = new ArrayList<>();
-    @JsonProperty("namespaceSelector")
-    private ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDENamespaceSelector namespaceSelector;
-    @JsonProperty("namespaces")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> namespaces = new ArrayList<>();
-    @JsonProperty("topologyKey")
-    private String topologyKey;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPARequiredDuringSchedulingIgnoredDuringExecution() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPARequiredDuringSchedulingIgnoredDuringExecution(ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDELabelSelector labelSelector, List<String> matchLabelKeys, List<String> mismatchLabelKeys, ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDENamespaceSelector namespaceSelector, List<String> namespaces, String topologyKey) {
-        super();
-        this.labelSelector = labelSelector;
-        this.matchLabelKeys = matchLabelKeys;
-        this.mismatchLabelKeys = mismatchLabelKeys;
-        this.namespaceSelector = namespaceSelector;
-        this.namespaces = namespaces;
-        this.topologyKey = topologyKey;
-    }
-
-    @JsonProperty("labelSelector")
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDELabelSelector getLabelSelector() {
-        return labelSelector;
-    }
-
-    @JsonProperty("labelSelector")
-    public void setLabelSelector(ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDELabelSelector labelSelector) {
-        this.labelSelector = labelSelector;
-    }
-
-    @JsonProperty("matchLabelKeys")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getMatchLabelKeys() {
-        return matchLabelKeys;
-    }
-
-    @JsonProperty("matchLabelKeys")
-    public void setMatchLabelKeys(List<String> matchLabelKeys) {
-        this.matchLabelKeys = matchLabelKeys;
-    }
-
-    @JsonProperty("mismatchLabelKeys")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getMismatchLabelKeys() {
-        return mismatchLabelKeys;
-    }
-
-    @JsonProperty("mismatchLabelKeys")
-    public void setMismatchLabelKeys(List<String> mismatchLabelKeys) {
-        this.mismatchLabelKeys = mismatchLabelKeys;
-    }
-
-    @JsonProperty("namespaceSelector")
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDENamespaceSelector getNamespaceSelector() {
-        return namespaceSelector;
-    }
-
-    @JsonProperty("namespaceSelector")
-    public void setNamespaceSelector(ClusterServiceVersionSpecISpecDSpecTSpecAPARDSIDENamespaceSelector namespaceSelector) {
-        this.namespaceSelector = namespaceSelector;
-    }
-
-    @JsonProperty("namespaces")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getNamespaces() {
-        return namespaces;
-    }
-
-    @JsonProperty("namespaces")
-    public void setNamespaces(List<String> namespaces) {
-        this.namespaces = namespaces;
-    }
-
-    @JsonProperty("topologyKey")
-    public String getTopologyKey() {
-        return topologyKey;
-    }
-
-    @JsonProperty("topologyKey")
-    public void setTopologyKey(String topologyKey) {
-        this.topologyKey = topologyKey;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPARequiredDuringSchedulingIgnoredDuringExecutionBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecAPARequiredDuringSchedulingIgnoredDuringExecutionBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPARequiredDuringSchedulingIgnoredDuringExecutionBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPodAffinity.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPodAffinity.java
deleted file mode 100644
index 0e474d0bb65..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPodAffinity.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "preferredDuringSchedulingIgnoredDuringExecution",
-    "requiredDuringSchedulingIgnoredDuringExecution"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecAPodAffinity implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecAPodAffinityBuilder> , KubernetesResource
-{
-
-    @JsonProperty("preferredDuringSchedulingIgnoredDuringExecution")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecAPAPreferredDuringSchedulingIgnoredDuringExecution> preferredDuringSchedulingIgnoredDuringExecution = new ArrayList<>();
-    @JsonProperty("requiredDuringSchedulingIgnoredDuringExecution")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecAPARequiredDuringSchedulingIgnoredDuringExecution> requiredDuringSchedulingIgnoredDuringExecution = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPodAffinity() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPodAffinity(List<ClusterServiceVersionSpecISpecDSpecTSpecAPAPreferredDuringSchedulingIgnoredDuringExecution> preferredDuringSchedulingIgnoredDuringExecution, List<ClusterServiceVersionSpecISpecDSpecTSpecAPARequiredDuringSchedulingIgnoredDuringExecution> requiredDuringSchedulingIgnoredDuringExecution) {
-        super();
-        this.preferredDuringSchedulingIgnoredDuringExecution = preferredDuringSchedulingIgnoredDuringExecution;
-        this.requiredDuringSchedulingIgnoredDuringExecution = requiredDuringSchedulingIgnoredDuringExecution;
-    }
-
-    @JsonProperty("preferredDuringSchedulingIgnoredDuringExecution")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecAPAPreferredDuringSchedulingIgnoredDuringExecution> getPreferredDuringSchedulingIgnoredDuringExecution() {
-        return preferredDuringSchedulingIgnoredDuringExecution;
-    }
-
-    @JsonProperty("preferredDuringSchedulingIgnoredDuringExecution")
-    public void setPreferredDuringSchedulingIgnoredDuringExecution(List<ClusterServiceVersionSpecISpecDSpecTSpecAPAPreferredDuringSchedulingIgnoredDuringExecution> preferredDuringSchedulingIgnoredDuringExecution) {
-        this.preferredDuringSchedulingIgnoredDuringExecution = preferredDuringSchedulingIgnoredDuringExecution;
-    }
-
-    @JsonProperty("requiredDuringSchedulingIgnoredDuringExecution")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecAPARequiredDuringSchedulingIgnoredDuringExecution> getRequiredDuringSchedulingIgnoredDuringExecution() {
-        return requiredDuringSchedulingIgnoredDuringExecution;
-    }
-
-    @JsonProperty("requiredDuringSchedulingIgnoredDuringExecution")
-    public void setRequiredDuringSchedulingIgnoredDuringExecution(List<ClusterServiceVersionSpecISpecDSpecTSpecAPARequiredDuringSchedulingIgnoredDuringExecution> requiredDuringSchedulingIgnoredDuringExecution) {
-        this.requiredDuringSchedulingIgnoredDuringExecution = requiredDuringSchedulingIgnoredDuringExecution;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPodAffinityBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecAPodAffinityBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPodAffinityBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPodAntiAffinity.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPodAntiAffinity.java
deleted file mode 100644
index c99c39c395e..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAPodAntiAffinity.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "preferredDuringSchedulingIgnoredDuringExecution",
-    "requiredDuringSchedulingIgnoredDuringExecution"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecAPodAntiAffinity implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecAPodAntiAffinityBuilder> , KubernetesResource
-{
-
-    @JsonProperty("preferredDuringSchedulingIgnoredDuringExecution")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecAPAAPreferredDuringSchedulingIgnoredDuringExecution> preferredDuringSchedulingIgnoredDuringExecution = new ArrayList<>();
-    @JsonProperty("requiredDuringSchedulingIgnoredDuringExecution")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecAPAARequiredDuringSchedulingIgnoredDuringExecution> requiredDuringSchedulingIgnoredDuringExecution = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPodAntiAffinity() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPodAntiAffinity(List<ClusterServiceVersionSpecISpecDSpecTSpecAPAAPreferredDuringSchedulingIgnoredDuringExecution> preferredDuringSchedulingIgnoredDuringExecution, List<ClusterServiceVersionSpecISpecDSpecTSpecAPAARequiredDuringSchedulingIgnoredDuringExecution> requiredDuringSchedulingIgnoredDuringExecution) {
-        super();
-        this.preferredDuringSchedulingIgnoredDuringExecution = preferredDuringSchedulingIgnoredDuringExecution;
-        this.requiredDuringSchedulingIgnoredDuringExecution = requiredDuringSchedulingIgnoredDuringExecution;
-    }
-
-    @JsonProperty("preferredDuringSchedulingIgnoredDuringExecution")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecAPAAPreferredDuringSchedulingIgnoredDuringExecution> getPreferredDuringSchedulingIgnoredDuringExecution() {
-        return preferredDuringSchedulingIgnoredDuringExecution;
-    }
-
-    @JsonProperty("preferredDuringSchedulingIgnoredDuringExecution")
-    public void setPreferredDuringSchedulingIgnoredDuringExecution(List<ClusterServiceVersionSpecISpecDSpecTSpecAPAAPreferredDuringSchedulingIgnoredDuringExecution> preferredDuringSchedulingIgnoredDuringExecution) {
-        this.preferredDuringSchedulingIgnoredDuringExecution = preferredDuringSchedulingIgnoredDuringExecution;
-    }
-
-    @JsonProperty("requiredDuringSchedulingIgnoredDuringExecution")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecAPAARequiredDuringSchedulingIgnoredDuringExecution> getRequiredDuringSchedulingIgnoredDuringExecution() {
-        return requiredDuringSchedulingIgnoredDuringExecution;
-    }
-
-    @JsonProperty("requiredDuringSchedulingIgnoredDuringExecution")
-    public void setRequiredDuringSchedulingIgnoredDuringExecution(List<ClusterServiceVersionSpecISpecDSpecTSpecAPAARequiredDuringSchedulingIgnoredDuringExecution> requiredDuringSchedulingIgnoredDuringExecution) {
-        this.requiredDuringSchedulingIgnoredDuringExecution = requiredDuringSchedulingIgnoredDuringExecution;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPodAntiAffinityBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecAPodAntiAffinityBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPodAntiAffinityBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAffinity.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAffinity.java
deleted file mode 100644
index 691b04ec496..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecAffinity.java
+++ /dev/null
@@ -1,136 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "nodeAffinity",
-    "podAffinity",
-    "podAntiAffinity"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecAffinity implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecAffinityBuilder> , KubernetesResource
-{
-
-    @JsonProperty("nodeAffinity")
-    private ClusterServiceVersionSpecISpecDSpecTSpecANodeAffinity nodeAffinity;
-    @JsonProperty("podAffinity")
-    private ClusterServiceVersionSpecISpecDSpecTSpecAPodAffinity podAffinity;
-    @JsonProperty("podAntiAffinity")
-    private ClusterServiceVersionSpecISpecDSpecTSpecAPodAntiAffinity podAntiAffinity;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecAffinity() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecAffinity(ClusterServiceVersionSpecISpecDSpecTSpecANodeAffinity nodeAffinity, ClusterServiceVersionSpecISpecDSpecTSpecAPodAffinity podAffinity, ClusterServiceVersionSpecISpecDSpecTSpecAPodAntiAffinity podAntiAffinity) {
-        super();
-        this.nodeAffinity = nodeAffinity;
-        this.podAffinity = podAffinity;
-        this.podAntiAffinity = podAntiAffinity;
-    }
-
-    @JsonProperty("nodeAffinity")
-    public ClusterServiceVersionSpecISpecDSpecTSpecANodeAffinity getNodeAffinity() {
-        return nodeAffinity;
-    }
-
-    @JsonProperty("nodeAffinity")
-    public void setNodeAffinity(ClusterServiceVersionSpecISpecDSpecTSpecANodeAffinity nodeAffinity) {
-        this.nodeAffinity = nodeAffinity;
-    }
-
-    @JsonProperty("podAffinity")
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPodAffinity getPodAffinity() {
-        return podAffinity;
-    }
-
-    @JsonProperty("podAffinity")
-    public void setPodAffinity(ClusterServiceVersionSpecISpecDSpecTSpecAPodAffinity podAffinity) {
-        this.podAffinity = podAffinity;
-    }
-
-    @JsonProperty("podAntiAffinity")
-    public ClusterServiceVersionSpecISpecDSpecTSpecAPodAntiAffinity getPodAntiAffinity() {
-        return podAntiAffinity;
-    }
-
-    @JsonProperty("podAntiAffinity")
-    public void setPodAntiAffinity(ClusterServiceVersionSpecISpecDSpecTSpecAPodAntiAffinity podAntiAffinity) {
-        this.podAntiAffinity = podAntiAffinity;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecAffinityBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecAffinityBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecAffinityBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCEFConfigMapRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCEFConfigMapRef.java
deleted file mode 100644
index 778d0acfca5..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCEFConfigMapRef.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name",
-    "optional"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecCEFConfigMapRef implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecCEFConfigMapRefBuilder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("optional")
-    private Boolean optional;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecCEFConfigMapRef() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecCEFConfigMapRef(String name, Boolean optional) {
-        super();
-        this.name = name;
-        this.optional = optional;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("optional")
-    public Boolean getOptional() {
-        return optional;
-    }
-
-    @JsonProperty("optional")
-    public void setOptional(Boolean optional) {
-        this.optional = optional;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCEFConfigMapRefBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecCEFConfigMapRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCEFConfigMapRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCEFSecretRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCEFSecretRef.java
deleted file mode 100644
index 344d7cfe37f..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCEFSecretRef.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name",
-    "optional"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecCEFSecretRef implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecCEFSecretRefBuilder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("optional")
-    private Boolean optional;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecCEFSecretRef() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecCEFSecretRef(String name, Boolean optional) {
-        super();
-        this.name = name;
-        this.optional = optional;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("optional")
-    public Boolean getOptional() {
-        return optional;
-    }
-
-    @JsonProperty("optional")
-    public void setOptional(Boolean optional) {
-        this.optional = optional;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCEFSecretRefBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecCEFSecretRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCEFSecretRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCEVFConfigMapKeyRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCEVFConfigMapKeyRef.java
deleted file mode 100644
index 19fd2b1343f..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCEVFConfigMapKeyRef.java
+++ /dev/null
@@ -1,136 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "name",
-    "optional"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecCEVFConfigMapKeyRef implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecCEVFConfigMapKeyRefBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("optional")
-    private Boolean optional;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecCEVFConfigMapKeyRef() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecCEVFConfigMapKeyRef(String key, String name, Boolean optional) {
-        super();
-        this.key = key;
-        this.name = name;
-        this.optional = optional;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("optional")
-    public Boolean getOptional() {
-        return optional;
-    }
-
-    @JsonProperty("optional")
-    public void setOptional(Boolean optional) {
-        this.optional = optional;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCEVFConfigMapKeyRefBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecCEVFConfigMapKeyRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCEVFConfigMapKeyRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCEVFFieldRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCEVFFieldRef.java
deleted file mode 100644
index 3a549b1b749..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCEVFFieldRef.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "apiVersion",
-    "fieldPath"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecCEVFFieldRef implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecCEVFFieldRefBuilder> , KubernetesResource
-{
-
-    @JsonProperty("apiVersion")
-    private String apiVersion;
-    @JsonProperty("fieldPath")
-    private String fieldPath;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecCEVFFieldRef() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecCEVFFieldRef(String apiVersion, String fieldPath) {
-        super();
-        this.apiVersion = apiVersion;
-        this.fieldPath = fieldPath;
-    }
-
-    @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;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCEVFFieldRefBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecCEVFFieldRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCEVFFieldRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCEVFResourceFieldRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCEVFResourceFieldRef.java
deleted file mode 100644
index 4cb4ec8a283..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCEVFResourceFieldRef.java
+++ /dev/null
@@ -1,138 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "containerName",
-    "divisor",
-    "resource"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecCEVFResourceFieldRef implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecCEVFResourceFieldRefBuilder> , KubernetesResource
-{
-
-    @JsonProperty("containerName")
-    private String containerName;
-    @JsonProperty("divisor")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object divisor;
-    @JsonProperty("resource")
-    private String resource;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecCEVFResourceFieldRef() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecCEVFResourceFieldRef(String containerName, Object divisor, String resource) {
-        super();
-        this.containerName = containerName;
-        this.divisor = divisor;
-        this.resource = resource;
-    }
-
-    @JsonProperty("containerName")
-    public String getContainerName() {
-        return containerName;
-    }
-
-    @JsonProperty("containerName")
-    public void setContainerName(String containerName) {
-        this.containerName = containerName;
-    }
-
-    @JsonProperty("divisor")
-    public Object getDivisor() {
-        return divisor;
-    }
-
-    @JsonProperty("divisor")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setDivisor(Object divisor) {
-        this.divisor = divisor;
-    }
-
-    @JsonProperty("resource")
-    public String getResource() {
-        return resource;
-    }
-
-    @JsonProperty("resource")
-    public void setResource(String resource) {
-        this.resource = resource;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCEVFResourceFieldRefBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecCEVFResourceFieldRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCEVFResourceFieldRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCEVFSecretKeyRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCEVFSecretKeyRef.java
deleted file mode 100644
index 7c7bd07463a..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCEVFSecretKeyRef.java
+++ /dev/null
@@ -1,136 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "name",
-    "optional"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecCEVFSecretKeyRef implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecCEVFSecretKeyRefBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("optional")
-    private Boolean optional;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecCEVFSecretKeyRef() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecCEVFSecretKeyRef(String key, String name, Boolean optional) {
-        super();
-        this.key = key;
-        this.name = name;
-        this.optional = optional;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("optional")
-    public Boolean getOptional() {
-        return optional;
-    }
-
-    @JsonProperty("optional")
-    public void setOptional(Boolean optional) {
-        this.optional = optional;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCEVFSecretKeyRefBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecCEVFSecretKeyRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCEVFSecretKeyRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCEValueFrom.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCEValueFrom.java
deleted file mode 100644
index 97501f49936..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCEValueFrom.java
+++ /dev/null
@@ -1,150 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "configMapKeyRef",
-    "fieldRef",
-    "resourceFieldRef",
-    "secretKeyRef"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecCEValueFrom implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecCEValueFromBuilder> , KubernetesResource
-{
-
-    @JsonProperty("configMapKeyRef")
-    private ClusterServiceVersionSpecISpecDSpecTSpecCEVFConfigMapKeyRef configMapKeyRef;
-    @JsonProperty("fieldRef")
-    private ClusterServiceVersionSpecISpecDSpecTSpecCEVFFieldRef fieldRef;
-    @JsonProperty("resourceFieldRef")
-    private ClusterServiceVersionSpecISpecDSpecTSpecCEVFResourceFieldRef resourceFieldRef;
-    @JsonProperty("secretKeyRef")
-    private ClusterServiceVersionSpecISpecDSpecTSpecCEVFSecretKeyRef secretKeyRef;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecCEValueFrom() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecCEValueFrom(ClusterServiceVersionSpecISpecDSpecTSpecCEVFConfigMapKeyRef configMapKeyRef, ClusterServiceVersionSpecISpecDSpecTSpecCEVFFieldRef fieldRef, ClusterServiceVersionSpecISpecDSpecTSpecCEVFResourceFieldRef resourceFieldRef, ClusterServiceVersionSpecISpecDSpecTSpecCEVFSecretKeyRef secretKeyRef) {
-        super();
-        this.configMapKeyRef = configMapKeyRef;
-        this.fieldRef = fieldRef;
-        this.resourceFieldRef = resourceFieldRef;
-        this.secretKeyRef = secretKeyRef;
-    }
-
-    @JsonProperty("configMapKeyRef")
-    public ClusterServiceVersionSpecISpecDSpecTSpecCEVFConfigMapKeyRef getConfigMapKeyRef() {
-        return configMapKeyRef;
-    }
-
-    @JsonProperty("configMapKeyRef")
-    public void setConfigMapKeyRef(ClusterServiceVersionSpecISpecDSpecTSpecCEVFConfigMapKeyRef configMapKeyRef) {
-        this.configMapKeyRef = configMapKeyRef;
-    }
-
-    @JsonProperty("fieldRef")
-    public ClusterServiceVersionSpecISpecDSpecTSpecCEVFFieldRef getFieldRef() {
-        return fieldRef;
-    }
-
-    @JsonProperty("fieldRef")
-    public void setFieldRef(ClusterServiceVersionSpecISpecDSpecTSpecCEVFFieldRef fieldRef) {
-        this.fieldRef = fieldRef;
-    }
-
-    @JsonProperty("resourceFieldRef")
-    public ClusterServiceVersionSpecISpecDSpecTSpecCEVFResourceFieldRef getResourceFieldRef() {
-        return resourceFieldRef;
-    }
-
-    @JsonProperty("resourceFieldRef")
-    public void setResourceFieldRef(ClusterServiceVersionSpecISpecDSpecTSpecCEVFResourceFieldRef resourceFieldRef) {
-        this.resourceFieldRef = resourceFieldRef;
-    }
-
-    @JsonProperty("secretKeyRef")
-    public ClusterServiceVersionSpecISpecDSpecTSpecCEVFSecretKeyRef getSecretKeyRef() {
-        return secretKeyRef;
-    }
-
-    @JsonProperty("secretKeyRef")
-    public void setSecretKeyRef(ClusterServiceVersionSpecISpecDSpecTSpecCEVFSecretKeyRef secretKeyRef) {
-        this.secretKeyRef = secretKeyRef;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCEValueFromBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecCEValueFromBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCEValueFromBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCEnv.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCEnv.java
deleted file mode 100644
index e91029a2bbb..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCEnv.java
+++ /dev/null
@@ -1,136 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name",
-    "value",
-    "valueFrom"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecCEnv implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecCEnvBuilder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("value")
-    private String value;
-    @JsonProperty("valueFrom")
-    private ClusterServiceVersionSpecISpecDSpecTSpecCEValueFrom valueFrom;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecCEnv() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecCEnv(String name, String value, ClusterServiceVersionSpecISpecDSpecTSpecCEValueFrom valueFrom) {
-        super();
-        this.name = name;
-        this.value = value;
-        this.valueFrom = valueFrom;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("value")
-    public String getValue() {
-        return value;
-    }
-
-    @JsonProperty("value")
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    @JsonProperty("valueFrom")
-    public ClusterServiceVersionSpecISpecDSpecTSpecCEValueFrom getValueFrom() {
-        return valueFrom;
-    }
-
-    @JsonProperty("valueFrom")
-    public void setValueFrom(ClusterServiceVersionSpecISpecDSpecTSpecCEValueFrom valueFrom) {
-        this.valueFrom = valueFrom;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCEnvBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecCEnvBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCEnvBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCEnvFrom.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCEnvFrom.java
deleted file mode 100644
index c1df987529d..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCEnvFrom.java
+++ /dev/null
@@ -1,136 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "configMapRef",
-    "prefix",
-    "secretRef"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecCEnvFrom implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecCEnvFromBuilder> , KubernetesResource
-{
-
-    @JsonProperty("configMapRef")
-    private ClusterServiceVersionSpecISpecDSpecTSpecCEFConfigMapRef configMapRef;
-    @JsonProperty("prefix")
-    private String prefix;
-    @JsonProperty("secretRef")
-    private ClusterServiceVersionSpecISpecDSpecTSpecCEFSecretRef secretRef;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecCEnvFrom() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecCEnvFrom(ClusterServiceVersionSpecISpecDSpecTSpecCEFConfigMapRef configMapRef, String prefix, ClusterServiceVersionSpecISpecDSpecTSpecCEFSecretRef secretRef) {
-        super();
-        this.configMapRef = configMapRef;
-        this.prefix = prefix;
-        this.secretRef = secretRef;
-    }
-
-    @JsonProperty("configMapRef")
-    public ClusterServiceVersionSpecISpecDSpecTSpecCEFConfigMapRef getConfigMapRef() {
-        return configMapRef;
-    }
-
-    @JsonProperty("configMapRef")
-    public void setConfigMapRef(ClusterServiceVersionSpecISpecDSpecTSpecCEFConfigMapRef configMapRef) {
-        this.configMapRef = configMapRef;
-    }
-
-    @JsonProperty("prefix")
-    public String getPrefix() {
-        return prefix;
-    }
-
-    @JsonProperty("prefix")
-    public void setPrefix(String prefix) {
-        this.prefix = prefix;
-    }
-
-    @JsonProperty("secretRef")
-    public ClusterServiceVersionSpecISpecDSpecTSpecCEFSecretRef getSecretRef() {
-        return secretRef;
-    }
-
-    @JsonProperty("secretRef")
-    public void setSecretRef(ClusterServiceVersionSpecISpecDSpecTSpecCEFSecretRef secretRef) {
-        this.secretRef = secretRef;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCEnvFromBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecCEnvFromBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCEnvFromBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLPExec.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLPExec.java
deleted file mode 100644
index 3c51b0d60c2..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLPExec.java
+++ /dev/null
@@ -1,112 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "command"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecCLPExec implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecCLPExecBuilder> , KubernetesResource
-{
-
-    @JsonProperty("command")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> command = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPExec() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPExec(List<String> command) {
-        super();
-        this.command = command;
-    }
-
-    @JsonProperty("command")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getCommand() {
-        return command;
-    }
-
-    @JsonProperty("command")
-    public void setCommand(List<String> command) {
-        this.command = command;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPExecBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecCLPExecBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPExecBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLPGrpc.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLPGrpc.java
deleted file mode 100644
index 176de3f05bd..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLPGrpc.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "port",
-    "service"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecCLPGrpc implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecCLPGrpcBuilder> , KubernetesResource
-{
-
-    @JsonProperty("port")
-    private Integer port;
-    @JsonProperty("service")
-    private String service;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPGrpc() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPGrpc(Integer port, String service) {
-        super();
-        this.port = port;
-        this.service = service;
-    }
-
-    @JsonProperty("port")
-    public Integer getPort() {
-        return port;
-    }
-
-    @JsonProperty("port")
-    public void setPort(Integer port) {
-        this.port = port;
-    }
-
-    @JsonProperty("service")
-    public String getService() {
-        return service;
-    }
-
-    @JsonProperty("service")
-    public void setService(String service) {
-        this.service = service;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPGrpcBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecCLPGrpcBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPGrpcBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLPHGHttpHeaders.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLPHGHttpHeaders.java
deleted file mode 100644
index 2416ea29b0f..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLPHGHttpHeaders.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name",
-    "value"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecCLPHGHttpHeaders implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecCLPHGHttpHeadersBuilder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("value")
-    private String value;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPHGHttpHeaders() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPHGHttpHeaders(String name, String value) {
-        super();
-        this.name = name;
-        this.value = value;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("value")
-    public String getValue() {
-        return value;
-    }
-
-    @JsonProperty("value")
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPHGHttpHeadersBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecCLPHGHttpHeadersBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPHGHttpHeadersBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLPHttpGet.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLPHttpGet.java
deleted file mode 100644
index 2e32145dbe4..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLPHttpGet.java
+++ /dev/null
@@ -1,170 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "host",
-    "httpHeaders",
-    "path",
-    "port",
-    "scheme"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecCLPHttpGet implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecCLPHttpGetBuilder> , KubernetesResource
-{
-
-    @JsonProperty("host")
-    private String host;
-    @JsonProperty("httpHeaders")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecCLPHGHttpHeaders> httpHeaders = new ArrayList<>();
-    @JsonProperty("path")
-    private String path;
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object port;
-    @JsonProperty("scheme")
-    private String scheme;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPHttpGet() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPHttpGet(String host, List<ClusterServiceVersionSpecISpecDSpecTSpecCLPHGHttpHeaders> httpHeaders, String path, Object port, String scheme) {
-        super();
-        this.host = host;
-        this.httpHeaders = httpHeaders;
-        this.path = path;
-        this.port = port;
-        this.scheme = scheme;
-    }
-
-    @JsonProperty("host")
-    public String getHost() {
-        return host;
-    }
-
-    @JsonProperty("host")
-    public void setHost(String host) {
-        this.host = host;
-    }
-
-    @JsonProperty("httpHeaders")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecCLPHGHttpHeaders> getHttpHeaders() {
-        return httpHeaders;
-    }
-
-    @JsonProperty("httpHeaders")
-    public void setHttpHeaders(List<ClusterServiceVersionSpecISpecDSpecTSpecCLPHGHttpHeaders> httpHeaders) {
-        this.httpHeaders = httpHeaders;
-    }
-
-    @JsonProperty("path")
-    public String getPath() {
-        return path;
-    }
-
-    @JsonProperty("path")
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @JsonProperty("port")
-    public Object getPort() {
-        return port;
-    }
-
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setPort(Object port) {
-        this.port = port;
-    }
-
-    @JsonProperty("scheme")
-    public String getScheme() {
-        return scheme;
-    }
-
-    @JsonProperty("scheme")
-    public void setScheme(String scheme) {
-        this.scheme = scheme;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPHttpGetBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecCLPHttpGetBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPHttpGetBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLPSExec.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLPSExec.java
deleted file mode 100644
index 01edf4ea0f9..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLPSExec.java
+++ /dev/null
@@ -1,112 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "command"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecCLPSExec implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecCLPSExecBuilder> , KubernetesResource
-{
-
-    @JsonProperty("command")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> command = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPSExec() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPSExec(List<String> command) {
-        super();
-        this.command = command;
-    }
-
-    @JsonProperty("command")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getCommand() {
-        return command;
-    }
-
-    @JsonProperty("command")
-    public void setCommand(List<String> command) {
-        this.command = command;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPSExecBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecCLPSExecBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPSExecBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLPSExec_1.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLPSExec_1.java
deleted file mode 100644
index a40098cc62a..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLPSExec_1.java
+++ /dev/null
@@ -1,112 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "command"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecCLPSExec_1 implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecCLPSExec_1Builder> , KubernetesResource
-{
-
-    @JsonProperty("command")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> command = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPSExec_1() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPSExec_1(List<String> command) {
-        super();
-        this.command = command;
-    }
-
-    @JsonProperty("command")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getCommand() {
-        return command;
-    }
-
-    @JsonProperty("command")
-    public void setCommand(List<String> command) {
-        this.command = command;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPSExec_1Builder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecCLPSExec_1Builder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPSExec_1Builder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLPSHGHttpHeaders.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLPSHGHttpHeaders.java
deleted file mode 100644
index c0534f80d2f..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLPSHGHttpHeaders.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name",
-    "value"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecCLPSHGHttpHeaders implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecCLPSHGHttpHeadersBuilder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("value")
-    private String value;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPSHGHttpHeaders() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPSHGHttpHeaders(String name, String value) {
-        super();
-        this.name = name;
-        this.value = value;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("value")
-    public String getValue() {
-        return value;
-    }
-
-    @JsonProperty("value")
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPSHGHttpHeadersBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecCLPSHGHttpHeadersBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPSHGHttpHeadersBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLPSHGHttpHeaders_1.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLPSHGHttpHeaders_1.java
deleted file mode 100644
index 282f320ac90..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLPSHGHttpHeaders_1.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name",
-    "value"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecCLPSHGHttpHeaders_1 implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecCLPSHGHttpHeaders_1Builder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("value")
-    private String value;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPSHGHttpHeaders_1() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPSHGHttpHeaders_1(String name, String value) {
-        super();
-        this.name = name;
-        this.value = value;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("value")
-    public String getValue() {
-        return value;
-    }
-
-    @JsonProperty("value")
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPSHGHttpHeaders_1Builder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecCLPSHGHttpHeaders_1Builder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPSHGHttpHeaders_1Builder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLPSHttpGet.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLPSHttpGet.java
deleted file mode 100644
index 15a50d645a0..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLPSHttpGet.java
+++ /dev/null
@@ -1,170 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "host",
-    "httpHeaders",
-    "path",
-    "port",
-    "scheme"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecCLPSHttpGet implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecCLPSHttpGetBuilder> , KubernetesResource
-{
-
-    @JsonProperty("host")
-    private String host;
-    @JsonProperty("httpHeaders")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecCLPSHGHttpHeaders> httpHeaders = new ArrayList<>();
-    @JsonProperty("path")
-    private String path;
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object port;
-    @JsonProperty("scheme")
-    private String scheme;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPSHttpGet() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPSHttpGet(String host, List<ClusterServiceVersionSpecISpecDSpecTSpecCLPSHGHttpHeaders> httpHeaders, String path, Object port, String scheme) {
-        super();
-        this.host = host;
-        this.httpHeaders = httpHeaders;
-        this.path = path;
-        this.port = port;
-        this.scheme = scheme;
-    }
-
-    @JsonProperty("host")
-    public String getHost() {
-        return host;
-    }
-
-    @JsonProperty("host")
-    public void setHost(String host) {
-        this.host = host;
-    }
-
-    @JsonProperty("httpHeaders")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecCLPSHGHttpHeaders> getHttpHeaders() {
-        return httpHeaders;
-    }
-
-    @JsonProperty("httpHeaders")
-    public void setHttpHeaders(List<ClusterServiceVersionSpecISpecDSpecTSpecCLPSHGHttpHeaders> httpHeaders) {
-        this.httpHeaders = httpHeaders;
-    }
-
-    @JsonProperty("path")
-    public String getPath() {
-        return path;
-    }
-
-    @JsonProperty("path")
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @JsonProperty("port")
-    public Object getPort() {
-        return port;
-    }
-
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setPort(Object port) {
-        this.port = port;
-    }
-
-    @JsonProperty("scheme")
-    public String getScheme() {
-        return scheme;
-    }
-
-    @JsonProperty("scheme")
-    public void setScheme(String scheme) {
-        this.scheme = scheme;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPSHttpGetBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecCLPSHttpGetBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPSHttpGetBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLPSHttpGet_1.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLPSHttpGet_1.java
deleted file mode 100644
index f8db5100a71..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLPSHttpGet_1.java
+++ /dev/null
@@ -1,170 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "host",
-    "httpHeaders",
-    "path",
-    "port",
-    "scheme"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecCLPSHttpGet_1 implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecCLPSHttpGet_1Builder> , KubernetesResource
-{
-
-    @JsonProperty("host")
-    private String host;
-    @JsonProperty("httpHeaders")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecCLPSHGHttpHeaders_1> httpHeaders = new ArrayList<>();
-    @JsonProperty("path")
-    private String path;
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object port;
-    @JsonProperty("scheme")
-    private String scheme;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPSHttpGet_1() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPSHttpGet_1(String host, List<ClusterServiceVersionSpecISpecDSpecTSpecCLPSHGHttpHeaders_1> httpHeaders, String path, Object port, String scheme) {
-        super();
-        this.host = host;
-        this.httpHeaders = httpHeaders;
-        this.path = path;
-        this.port = port;
-        this.scheme = scheme;
-    }
-
-    @JsonProperty("host")
-    public String getHost() {
-        return host;
-    }
-
-    @JsonProperty("host")
-    public void setHost(String host) {
-        this.host = host;
-    }
-
-    @JsonProperty("httpHeaders")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecCLPSHGHttpHeaders_1> getHttpHeaders() {
-        return httpHeaders;
-    }
-
-    @JsonProperty("httpHeaders")
-    public void setHttpHeaders(List<ClusterServiceVersionSpecISpecDSpecTSpecCLPSHGHttpHeaders_1> httpHeaders) {
-        this.httpHeaders = httpHeaders;
-    }
-
-    @JsonProperty("path")
-    public String getPath() {
-        return path;
-    }
-
-    @JsonProperty("path")
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @JsonProperty("port")
-    public Object getPort() {
-        return port;
-    }
-
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setPort(Object port) {
-        this.port = port;
-    }
-
-    @JsonProperty("scheme")
-    public String getScheme() {
-        return scheme;
-    }
-
-    @JsonProperty("scheme")
-    public void setScheme(String scheme) {
-        this.scheme = scheme;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPSHttpGet_1Builder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecCLPSHttpGet_1Builder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPSHttpGet_1Builder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLPSSleep.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLPSSleep.java
deleted file mode 100644
index 16bc3409ee4..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLPSSleep.java
+++ /dev/null
@@ -1,108 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "seconds"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecCLPSSleep implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecCLPSSleepBuilder> , KubernetesResource
-{
-
-    @JsonProperty("seconds")
-    private Long seconds;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPSSleep() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPSSleep(Long seconds) {
-        super();
-        this.seconds = seconds;
-    }
-
-    @JsonProperty("seconds")
-    public Long getSeconds() {
-        return seconds;
-    }
-
-    @JsonProperty("seconds")
-    public void setSeconds(Long seconds) {
-        this.seconds = seconds;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPSSleepBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecCLPSSleepBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPSSleepBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLPSSleep_1.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLPSSleep_1.java
deleted file mode 100644
index 35b020adceb..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLPSSleep_1.java
+++ /dev/null
@@ -1,108 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "seconds"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecCLPSSleep_1 implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecCLPSSleep_1Builder> , KubernetesResource
-{
-
-    @JsonProperty("seconds")
-    private Long seconds;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPSSleep_1() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPSSleep_1(Long seconds) {
-        super();
-        this.seconds = seconds;
-    }
-
-    @JsonProperty("seconds")
-    public Long getSeconds() {
-        return seconds;
-    }
-
-    @JsonProperty("seconds")
-    public void setSeconds(Long seconds) {
-        this.seconds = seconds;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPSSleep_1Builder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecCLPSSleep_1Builder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPSSleep_1Builder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLPSTcpSocket.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLPSTcpSocket.java
deleted file mode 100644
index c86c3975818..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLPSTcpSocket.java
+++ /dev/null
@@ -1,124 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "host",
-    "port"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecCLPSTcpSocket implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecCLPSTcpSocketBuilder> , KubernetesResource
-{
-
-    @JsonProperty("host")
-    private String host;
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object port;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPSTcpSocket() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPSTcpSocket(String host, Object port) {
-        super();
-        this.host = host;
-        this.port = port;
-    }
-
-    @JsonProperty("host")
-    public String getHost() {
-        return host;
-    }
-
-    @JsonProperty("host")
-    public void setHost(String host) {
-        this.host = host;
-    }
-
-    @JsonProperty("port")
-    public Object getPort() {
-        return port;
-    }
-
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setPort(Object port) {
-        this.port = port;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPSTcpSocketBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecCLPSTcpSocketBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPSTcpSocketBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLPSTcpSocket_1.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLPSTcpSocket_1.java
deleted file mode 100644
index 48fb99e8f13..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLPSTcpSocket_1.java
+++ /dev/null
@@ -1,124 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "host",
-    "port"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecCLPSTcpSocket_1 implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecCLPSTcpSocket_1Builder> , KubernetesResource
-{
-
-    @JsonProperty("host")
-    private String host;
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object port;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPSTcpSocket_1() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPSTcpSocket_1(String host, Object port) {
-        super();
-        this.host = host;
-        this.port = port;
-    }
-
-    @JsonProperty("host")
-    public String getHost() {
-        return host;
-    }
-
-    @JsonProperty("host")
-    public void setHost(String host) {
-        this.host = host;
-    }
-
-    @JsonProperty("port")
-    public Object getPort() {
-        return port;
-    }
-
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setPort(Object port) {
-        this.port = port;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPSTcpSocket_1Builder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecCLPSTcpSocket_1Builder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPSTcpSocket_1Builder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLPTcpSocket.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLPTcpSocket.java
deleted file mode 100644
index 516b7a40ad1..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLPTcpSocket.java
+++ /dev/null
@@ -1,124 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "host",
-    "port"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecCLPTcpSocket implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecCLPTcpSocketBuilder> , KubernetesResource
-{
-
-    @JsonProperty("host")
-    private String host;
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object port;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPTcpSocket() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPTcpSocket(String host, Object port) {
-        super();
-        this.host = host;
-        this.port = port;
-    }
-
-    @JsonProperty("host")
-    public String getHost() {
-        return host;
-    }
-
-    @JsonProperty("host")
-    public void setHost(String host) {
-        this.host = host;
-    }
-
-    @JsonProperty("port")
-    public Object getPort() {
-        return port;
-    }
-
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setPort(Object port) {
-        this.port = port;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPTcpSocketBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecCLPTcpSocketBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPTcpSocketBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLPostStart.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLPostStart.java
deleted file mode 100644
index 1da68ede65f..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLPostStart.java
+++ /dev/null
@@ -1,150 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "exec",
-    "httpGet",
-    "sleep",
-    "tcpSocket"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecCLPostStart implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecCLPostStartBuilder> , KubernetesResource
-{
-
-    @JsonProperty("exec")
-    private ClusterServiceVersionSpecISpecDSpecTSpecCLPSExec exec;
-    @JsonProperty("httpGet")
-    private ClusterServiceVersionSpecISpecDSpecTSpecCLPSHttpGet httpGet;
-    @JsonProperty("sleep")
-    private ClusterServiceVersionSpecISpecDSpecTSpecCLPSSleep sleep;
-    @JsonProperty("tcpSocket")
-    private ClusterServiceVersionSpecISpecDSpecTSpecCLPSTcpSocket tcpSocket;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPostStart() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPostStart(ClusterServiceVersionSpecISpecDSpecTSpecCLPSExec exec, ClusterServiceVersionSpecISpecDSpecTSpecCLPSHttpGet httpGet, ClusterServiceVersionSpecISpecDSpecTSpecCLPSSleep sleep, ClusterServiceVersionSpecISpecDSpecTSpecCLPSTcpSocket tcpSocket) {
-        super();
-        this.exec = exec;
-        this.httpGet = httpGet;
-        this.sleep = sleep;
-        this.tcpSocket = tcpSocket;
-    }
-
-    @JsonProperty("exec")
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPSExec getExec() {
-        return exec;
-    }
-
-    @JsonProperty("exec")
-    public void setExec(ClusterServiceVersionSpecISpecDSpecTSpecCLPSExec exec) {
-        this.exec = exec;
-    }
-
-    @JsonProperty("httpGet")
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPSHttpGet getHttpGet() {
-        return httpGet;
-    }
-
-    @JsonProperty("httpGet")
-    public void setHttpGet(ClusterServiceVersionSpecISpecDSpecTSpecCLPSHttpGet httpGet) {
-        this.httpGet = httpGet;
-    }
-
-    @JsonProperty("sleep")
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPSSleep getSleep() {
-        return sleep;
-    }
-
-    @JsonProperty("sleep")
-    public void setSleep(ClusterServiceVersionSpecISpecDSpecTSpecCLPSSleep sleep) {
-        this.sleep = sleep;
-    }
-
-    @JsonProperty("tcpSocket")
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPSTcpSocket getTcpSocket() {
-        return tcpSocket;
-    }
-
-    @JsonProperty("tcpSocket")
-    public void setTcpSocket(ClusterServiceVersionSpecISpecDSpecTSpecCLPSTcpSocket tcpSocket) {
-        this.tcpSocket = tcpSocket;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPostStartBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecCLPostStartBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPostStartBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLPreStop.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLPreStop.java
deleted file mode 100644
index bdad90f6b66..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLPreStop.java
+++ /dev/null
@@ -1,150 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "exec",
-    "httpGet",
-    "sleep",
-    "tcpSocket"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecCLPreStop implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecCLPreStopBuilder> , KubernetesResource
-{
-
-    @JsonProperty("exec")
-    private ClusterServiceVersionSpecISpecDSpecTSpecCLPSExec_1 exec;
-    @JsonProperty("httpGet")
-    private ClusterServiceVersionSpecISpecDSpecTSpecCLPSHttpGet_1 httpGet;
-    @JsonProperty("sleep")
-    private ClusterServiceVersionSpecISpecDSpecTSpecCLPSSleep_1 sleep;
-    @JsonProperty("tcpSocket")
-    private ClusterServiceVersionSpecISpecDSpecTSpecCLPSTcpSocket_1 tcpSocket;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPreStop() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPreStop(ClusterServiceVersionSpecISpecDSpecTSpecCLPSExec_1 exec, ClusterServiceVersionSpecISpecDSpecTSpecCLPSHttpGet_1 httpGet, ClusterServiceVersionSpecISpecDSpecTSpecCLPSSleep_1 sleep, ClusterServiceVersionSpecISpecDSpecTSpecCLPSTcpSocket_1 tcpSocket) {
-        super();
-        this.exec = exec;
-        this.httpGet = httpGet;
-        this.sleep = sleep;
-        this.tcpSocket = tcpSocket;
-    }
-
-    @JsonProperty("exec")
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPSExec_1 getExec() {
-        return exec;
-    }
-
-    @JsonProperty("exec")
-    public void setExec(ClusterServiceVersionSpecISpecDSpecTSpecCLPSExec_1 exec) {
-        this.exec = exec;
-    }
-
-    @JsonProperty("httpGet")
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPSHttpGet_1 getHttpGet() {
-        return httpGet;
-    }
-
-    @JsonProperty("httpGet")
-    public void setHttpGet(ClusterServiceVersionSpecISpecDSpecTSpecCLPSHttpGet_1 httpGet) {
-        this.httpGet = httpGet;
-    }
-
-    @JsonProperty("sleep")
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPSSleep_1 getSleep() {
-        return sleep;
-    }
-
-    @JsonProperty("sleep")
-    public void setSleep(ClusterServiceVersionSpecISpecDSpecTSpecCLPSSleep_1 sleep) {
-        this.sleep = sleep;
-    }
-
-    @JsonProperty("tcpSocket")
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPSTcpSocket_1 getTcpSocket() {
-        return tcpSocket;
-    }
-
-    @JsonProperty("tcpSocket")
-    public void setTcpSocket(ClusterServiceVersionSpecISpecDSpecTSpecCLPSTcpSocket_1 tcpSocket) {
-        this.tcpSocket = tcpSocket;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPreStopBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecCLPreStopBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPreStopBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLifecycle.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLifecycle.java
deleted file mode 100644
index 5ed3e518bbe..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLifecycle.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "postStart",
-    "preStop"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecCLifecycle implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecCLifecycleBuilder> , KubernetesResource
-{
-
-    @JsonProperty("postStart")
-    private ClusterServiceVersionSpecISpecDSpecTSpecCLPostStart postStart;
-    @JsonProperty("preStop")
-    private ClusterServiceVersionSpecISpecDSpecTSpecCLPreStop preStop;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLifecycle() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLifecycle(ClusterServiceVersionSpecISpecDSpecTSpecCLPostStart postStart, ClusterServiceVersionSpecISpecDSpecTSpecCLPreStop preStop) {
-        super();
-        this.postStart = postStart;
-        this.preStop = preStop;
-    }
-
-    @JsonProperty("postStart")
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPostStart getPostStart() {
-        return postStart;
-    }
-
-    @JsonProperty("postStart")
-    public void setPostStart(ClusterServiceVersionSpecISpecDSpecTSpecCLPostStart postStart) {
-        this.postStart = postStart;
-    }
-
-    @JsonProperty("preStop")
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPreStop getPreStop() {
-        return preStop;
-    }
-
-    @JsonProperty("preStop")
-    public void setPreStop(ClusterServiceVersionSpecISpecDSpecTSpecCLPreStop preStop) {
-        this.preStop = preStop;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLifecycleBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecCLifecycleBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLifecycleBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLivenessProbe.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLivenessProbe.java
deleted file mode 100644
index 5c10eb9b797..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCLivenessProbe.java
+++ /dev/null
@@ -1,234 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "exec",
-    "failureThreshold",
-    "grpc",
-    "httpGet",
-    "initialDelaySeconds",
-    "periodSeconds",
-    "successThreshold",
-    "tcpSocket",
-    "terminationGracePeriodSeconds",
-    "timeoutSeconds"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecCLivenessProbe implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecCLivenessProbeBuilder> , KubernetesResource
-{
-
-    @JsonProperty("exec")
-    private ClusterServiceVersionSpecISpecDSpecTSpecCLPExec exec;
-    @JsonProperty("failureThreshold")
-    private Integer failureThreshold;
-    @JsonProperty("grpc")
-    private ClusterServiceVersionSpecISpecDSpecTSpecCLPGrpc grpc;
-    @JsonProperty("httpGet")
-    private ClusterServiceVersionSpecISpecDSpecTSpecCLPHttpGet httpGet;
-    @JsonProperty("initialDelaySeconds")
-    private Integer initialDelaySeconds;
-    @JsonProperty("periodSeconds")
-    private Integer periodSeconds;
-    @JsonProperty("successThreshold")
-    private Integer successThreshold;
-    @JsonProperty("tcpSocket")
-    private ClusterServiceVersionSpecISpecDSpecTSpecCLPTcpSocket tcpSocket;
-    @JsonProperty("terminationGracePeriodSeconds")
-    private Long terminationGracePeriodSeconds;
-    @JsonProperty("timeoutSeconds")
-    private Integer timeoutSeconds;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLivenessProbe() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLivenessProbe(ClusterServiceVersionSpecISpecDSpecTSpecCLPExec exec, Integer failureThreshold, ClusterServiceVersionSpecISpecDSpecTSpecCLPGrpc grpc, ClusterServiceVersionSpecISpecDSpecTSpecCLPHttpGet httpGet, Integer initialDelaySeconds, Integer periodSeconds, Integer successThreshold, ClusterServiceVersionSpecISpecDSpecTSpecCLPTcpSocket tcpSocket, Long terminationGracePeriodSeconds, Integer timeoutSeconds) {
-        super();
-        this.exec = exec;
-        this.failureThreshold = failureThreshold;
-        this.grpc = grpc;
-        this.httpGet = httpGet;
-        this.initialDelaySeconds = initialDelaySeconds;
-        this.periodSeconds = periodSeconds;
-        this.successThreshold = successThreshold;
-        this.tcpSocket = tcpSocket;
-        this.terminationGracePeriodSeconds = terminationGracePeriodSeconds;
-        this.timeoutSeconds = timeoutSeconds;
-    }
-
-    @JsonProperty("exec")
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPExec getExec() {
-        return exec;
-    }
-
-    @JsonProperty("exec")
-    public void setExec(ClusterServiceVersionSpecISpecDSpecTSpecCLPExec exec) {
-        this.exec = exec;
-    }
-
-    @JsonProperty("failureThreshold")
-    public Integer getFailureThreshold() {
-        return failureThreshold;
-    }
-
-    @JsonProperty("failureThreshold")
-    public void setFailureThreshold(Integer failureThreshold) {
-        this.failureThreshold = failureThreshold;
-    }
-
-    @JsonProperty("grpc")
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPGrpc getGrpc() {
-        return grpc;
-    }
-
-    @JsonProperty("grpc")
-    public void setGrpc(ClusterServiceVersionSpecISpecDSpecTSpecCLPGrpc grpc) {
-        this.grpc = grpc;
-    }
-
-    @JsonProperty("httpGet")
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPHttpGet getHttpGet() {
-        return httpGet;
-    }
-
-    @JsonProperty("httpGet")
-    public void setHttpGet(ClusterServiceVersionSpecISpecDSpecTSpecCLPHttpGet httpGet) {
-        this.httpGet = httpGet;
-    }
-
-    @JsonProperty("initialDelaySeconds")
-    public Integer getInitialDelaySeconds() {
-        return initialDelaySeconds;
-    }
-
-    @JsonProperty("initialDelaySeconds")
-    public void setInitialDelaySeconds(Integer initialDelaySeconds) {
-        this.initialDelaySeconds = initialDelaySeconds;
-    }
-
-    @JsonProperty("periodSeconds")
-    public Integer getPeriodSeconds() {
-        return periodSeconds;
-    }
-
-    @JsonProperty("periodSeconds")
-    public void setPeriodSeconds(Integer periodSeconds) {
-        this.periodSeconds = periodSeconds;
-    }
-
-    @JsonProperty("successThreshold")
-    public Integer getSuccessThreshold() {
-        return successThreshold;
-    }
-
-    @JsonProperty("successThreshold")
-    public void setSuccessThreshold(Integer successThreshold) {
-        this.successThreshold = successThreshold;
-    }
-
-    @JsonProperty("tcpSocket")
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLPTcpSocket getTcpSocket() {
-        return tcpSocket;
-    }
-
-    @JsonProperty("tcpSocket")
-    public void setTcpSocket(ClusterServiceVersionSpecISpecDSpecTSpecCLPTcpSocket tcpSocket) {
-        this.tcpSocket = tcpSocket;
-    }
-
-    @JsonProperty("terminationGracePeriodSeconds")
-    public Long getTerminationGracePeriodSeconds() {
-        return terminationGracePeriodSeconds;
-    }
-
-    @JsonProperty("terminationGracePeriodSeconds")
-    public void setTerminationGracePeriodSeconds(Long terminationGracePeriodSeconds) {
-        this.terminationGracePeriodSeconds = terminationGracePeriodSeconds;
-    }
-
-    @JsonProperty("timeoutSeconds")
-    public Integer getTimeoutSeconds() {
-        return timeoutSeconds;
-    }
-
-    @JsonProperty("timeoutSeconds")
-    public void setTimeoutSeconds(Integer timeoutSeconds) {
-        this.timeoutSeconds = timeoutSeconds;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLivenessProbeBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecCLivenessProbeBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLivenessProbeBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCPorts.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCPorts.java
deleted file mode 100644
index 18f3ee8824f..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCPorts.java
+++ /dev/null
@@ -1,164 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "containerPort",
-    "hostIP",
-    "hostPort",
-    "name",
-    "protocol"
-})
-@ToString
-@EqualsAndHashCode
-@Accessors(prefix = {
-    "_",
-    ""
-})
-@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
-    @BuildableReference(ObjectMeta.class),
-    @BuildableReference(LabelSelector.class),
-    @BuildableReference(Container.class),
-    @BuildableReference(PodTemplateSpec.class),
-    @BuildableReference(ResourceRequirements.class),
-    @BuildableReference(IntOrString.class),
-    @BuildableReference(ObjectReference.class),
-    @BuildableReference(LocalObjectReference.class),
-    @BuildableReference(PersistentVolumeClaim.class)
-})
-@Generated("jsonschema2pojo")
-public class ClusterServiceVersionSpecISpecDSpecTSpecCPorts implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecCPortsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("containerPort")
-    private Integer containerPort;
-    @JsonProperty("hostIP")
-    private String hostIP;
-    @JsonProperty("hostPort")
-    private Integer hostPort;
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("protocol")
-    private String protocol;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecCPorts() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecCPorts(Integer containerPort, String hostIP, Integer hostPort, String name, String protocol) {
-        super();
-        this.containerPort = containerPort;
-        this.hostIP = hostIP;
-        this.hostPort = hostPort;
-        this.name = name;
-        this.protocol = protocol;
-    }
-
-    @JsonProperty("containerPort")
-    public Integer getContainerPort() {
-        return containerPort;
-    }
-
-    @JsonProperty("containerPort")
-    public void setContainerPort(Integer containerPort) {
-        this.containerPort = containerPort;
-    }
-
-    @JsonProperty("hostIP")
-    public String getHostIP() {
-        return hostIP;
-    }
-
-    @JsonProperty("hostIP")
-    public void setHostIP(String hostIP) {
-        this.hostIP = hostIP;
-    }
-
-    @JsonProperty("hostPort")
-    public Integer getHostPort() {
-        return hostPort;
-    }
-
-    @JsonProperty("hostPort")
-    public void setHostPort(Integer hostPort) {
-        this.hostPort = hostPort;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("protocol")
-    public String getProtocol() {
-        return protocol;
-    }
-
-    @JsonProperty("protocol")
-    public void setProtocol(String protocol) {
-        this.protocol = protocol;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCPortsBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecCPortsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCPortsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCRClaims.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCRClaims.java
deleted file mode 100644
index 5d09736befd..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCRClaims.java
+++ /dev/null
@@ -1,108 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecCRClaims implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecCRClaimsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecCRClaims() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecCRClaims(String name) {
-        super();
-        this.name = name;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCRClaimsBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecCRClaimsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCRClaimsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCRPExec.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCRPExec.java
deleted file mode 100644
index 5057676232e..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCRPExec.java
+++ /dev/null
@@ -1,112 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "command"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecCRPExec implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecCRPExecBuilder> , KubernetesResource
-{
-
-    @JsonProperty("command")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> command = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecCRPExec() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecCRPExec(List<String> command) {
-        super();
-        this.command = command;
-    }
-
-    @JsonProperty("command")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getCommand() {
-        return command;
-    }
-
-    @JsonProperty("command")
-    public void setCommand(List<String> command) {
-        this.command = command;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCRPExecBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecCRPExecBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCRPExecBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCRPGrpc.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCRPGrpc.java
deleted file mode 100644
index 3a952edff15..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCRPGrpc.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "port",
-    "service"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecCRPGrpc implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecCRPGrpcBuilder> , KubernetesResource
-{
-
-    @JsonProperty("port")
-    private Integer port;
-    @JsonProperty("service")
-    private String service;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecCRPGrpc() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecCRPGrpc(Integer port, String service) {
-        super();
-        this.port = port;
-        this.service = service;
-    }
-
-    @JsonProperty("port")
-    public Integer getPort() {
-        return port;
-    }
-
-    @JsonProperty("port")
-    public void setPort(Integer port) {
-        this.port = port;
-    }
-
-    @JsonProperty("service")
-    public String getService() {
-        return service;
-    }
-
-    @JsonProperty("service")
-    public void setService(String service) {
-        this.service = service;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCRPGrpcBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecCRPGrpcBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCRPGrpcBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCRPHGHttpHeaders.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCRPHGHttpHeaders.java
deleted file mode 100644
index 4cdba43ee0e..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCRPHGHttpHeaders.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name",
-    "value"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecCRPHGHttpHeaders implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecCRPHGHttpHeadersBuilder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("value")
-    private String value;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecCRPHGHttpHeaders() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecCRPHGHttpHeaders(String name, String value) {
-        super();
-        this.name = name;
-        this.value = value;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("value")
-    public String getValue() {
-        return value;
-    }
-
-    @JsonProperty("value")
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCRPHGHttpHeadersBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecCRPHGHttpHeadersBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCRPHGHttpHeadersBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCRPHttpGet.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCRPHttpGet.java
deleted file mode 100644
index 31de263d31c..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCRPHttpGet.java
+++ /dev/null
@@ -1,170 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "host",
-    "httpHeaders",
-    "path",
-    "port",
-    "scheme"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecCRPHttpGet implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecCRPHttpGetBuilder> , KubernetesResource
-{
-
-    @JsonProperty("host")
-    private String host;
-    @JsonProperty("httpHeaders")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecCRPHGHttpHeaders> httpHeaders = new ArrayList<>();
-    @JsonProperty("path")
-    private String path;
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object port;
-    @JsonProperty("scheme")
-    private String scheme;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecCRPHttpGet() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecCRPHttpGet(String host, List<ClusterServiceVersionSpecISpecDSpecTSpecCRPHGHttpHeaders> httpHeaders, String path, Object port, String scheme) {
-        super();
-        this.host = host;
-        this.httpHeaders = httpHeaders;
-        this.path = path;
-        this.port = port;
-        this.scheme = scheme;
-    }
-
-    @JsonProperty("host")
-    public String getHost() {
-        return host;
-    }
-
-    @JsonProperty("host")
-    public void setHost(String host) {
-        this.host = host;
-    }
-
-    @JsonProperty("httpHeaders")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecCRPHGHttpHeaders> getHttpHeaders() {
-        return httpHeaders;
-    }
-
-    @JsonProperty("httpHeaders")
-    public void setHttpHeaders(List<ClusterServiceVersionSpecISpecDSpecTSpecCRPHGHttpHeaders> httpHeaders) {
-        this.httpHeaders = httpHeaders;
-    }
-
-    @JsonProperty("path")
-    public String getPath() {
-        return path;
-    }
-
-    @JsonProperty("path")
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @JsonProperty("port")
-    public Object getPort() {
-        return port;
-    }
-
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setPort(Object port) {
-        this.port = port;
-    }
-
-    @JsonProperty("scheme")
-    public String getScheme() {
-        return scheme;
-    }
-
-    @JsonProperty("scheme")
-    public void setScheme(String scheme) {
-        this.scheme = scheme;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCRPHttpGetBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecCRPHttpGetBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCRPHttpGetBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCRPTcpSocket.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCRPTcpSocket.java
deleted file mode 100644
index bd3e9e04588..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCRPTcpSocket.java
+++ /dev/null
@@ -1,124 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "host",
-    "port"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecCRPTcpSocket implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecCRPTcpSocketBuilder> , KubernetesResource
-{
-
-    @JsonProperty("host")
-    private String host;
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object port;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecCRPTcpSocket() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecCRPTcpSocket(String host, Object port) {
-        super();
-        this.host = host;
-        this.port = port;
-    }
-
-    @JsonProperty("host")
-    public String getHost() {
-        return host;
-    }
-
-    @JsonProperty("host")
-    public void setHost(String host) {
-        this.host = host;
-    }
-
-    @JsonProperty("port")
-    public Object getPort() {
-        return port;
-    }
-
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setPort(Object port) {
-        this.port = port;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCRPTcpSocketBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecCRPTcpSocketBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCRPTcpSocketBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCReadinessProbe.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCReadinessProbe.java
deleted file mode 100644
index 31a2e964070..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCReadinessProbe.java
+++ /dev/null
@@ -1,234 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "exec",
-    "failureThreshold",
-    "grpc",
-    "httpGet",
-    "initialDelaySeconds",
-    "periodSeconds",
-    "successThreshold",
-    "tcpSocket",
-    "terminationGracePeriodSeconds",
-    "timeoutSeconds"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecCReadinessProbe implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecCReadinessProbeBuilder> , KubernetesResource
-{
-
-    @JsonProperty("exec")
-    private ClusterServiceVersionSpecISpecDSpecTSpecCRPExec exec;
-    @JsonProperty("failureThreshold")
-    private Integer failureThreshold;
-    @JsonProperty("grpc")
-    private ClusterServiceVersionSpecISpecDSpecTSpecCRPGrpc grpc;
-    @JsonProperty("httpGet")
-    private ClusterServiceVersionSpecISpecDSpecTSpecCRPHttpGet httpGet;
-    @JsonProperty("initialDelaySeconds")
-    private Integer initialDelaySeconds;
-    @JsonProperty("periodSeconds")
-    private Integer periodSeconds;
-    @JsonProperty("successThreshold")
-    private Integer successThreshold;
-    @JsonProperty("tcpSocket")
-    private ClusterServiceVersionSpecISpecDSpecTSpecCRPTcpSocket tcpSocket;
-    @JsonProperty("terminationGracePeriodSeconds")
-    private Long terminationGracePeriodSeconds;
-    @JsonProperty("timeoutSeconds")
-    private Integer timeoutSeconds;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecCReadinessProbe() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecCReadinessProbe(ClusterServiceVersionSpecISpecDSpecTSpecCRPExec exec, Integer failureThreshold, ClusterServiceVersionSpecISpecDSpecTSpecCRPGrpc grpc, ClusterServiceVersionSpecISpecDSpecTSpecCRPHttpGet httpGet, Integer initialDelaySeconds, Integer periodSeconds, Integer successThreshold, ClusterServiceVersionSpecISpecDSpecTSpecCRPTcpSocket tcpSocket, Long terminationGracePeriodSeconds, Integer timeoutSeconds) {
-        super();
-        this.exec = exec;
-        this.failureThreshold = failureThreshold;
-        this.grpc = grpc;
-        this.httpGet = httpGet;
-        this.initialDelaySeconds = initialDelaySeconds;
-        this.periodSeconds = periodSeconds;
-        this.successThreshold = successThreshold;
-        this.tcpSocket = tcpSocket;
-        this.terminationGracePeriodSeconds = terminationGracePeriodSeconds;
-        this.timeoutSeconds = timeoutSeconds;
-    }
-
-    @JsonProperty("exec")
-    public ClusterServiceVersionSpecISpecDSpecTSpecCRPExec getExec() {
-        return exec;
-    }
-
-    @JsonProperty("exec")
-    public void setExec(ClusterServiceVersionSpecISpecDSpecTSpecCRPExec exec) {
-        this.exec = exec;
-    }
-
-    @JsonProperty("failureThreshold")
-    public Integer getFailureThreshold() {
-        return failureThreshold;
-    }
-
-    @JsonProperty("failureThreshold")
-    public void setFailureThreshold(Integer failureThreshold) {
-        this.failureThreshold = failureThreshold;
-    }
-
-    @JsonProperty("grpc")
-    public ClusterServiceVersionSpecISpecDSpecTSpecCRPGrpc getGrpc() {
-        return grpc;
-    }
-
-    @JsonProperty("grpc")
-    public void setGrpc(ClusterServiceVersionSpecISpecDSpecTSpecCRPGrpc grpc) {
-        this.grpc = grpc;
-    }
-
-    @JsonProperty("httpGet")
-    public ClusterServiceVersionSpecISpecDSpecTSpecCRPHttpGet getHttpGet() {
-        return httpGet;
-    }
-
-    @JsonProperty("httpGet")
-    public void setHttpGet(ClusterServiceVersionSpecISpecDSpecTSpecCRPHttpGet httpGet) {
-        this.httpGet = httpGet;
-    }
-
-    @JsonProperty("initialDelaySeconds")
-    public Integer getInitialDelaySeconds() {
-        return initialDelaySeconds;
-    }
-
-    @JsonProperty("initialDelaySeconds")
-    public void setInitialDelaySeconds(Integer initialDelaySeconds) {
-        this.initialDelaySeconds = initialDelaySeconds;
-    }
-
-    @JsonProperty("periodSeconds")
-    public Integer getPeriodSeconds() {
-        return periodSeconds;
-    }
-
-    @JsonProperty("periodSeconds")
-    public void setPeriodSeconds(Integer periodSeconds) {
-        this.periodSeconds = periodSeconds;
-    }
-
-    @JsonProperty("successThreshold")
-    public Integer getSuccessThreshold() {
-        return successThreshold;
-    }
-
-    @JsonProperty("successThreshold")
-    public void setSuccessThreshold(Integer successThreshold) {
-        this.successThreshold = successThreshold;
-    }
-
-    @JsonProperty("tcpSocket")
-    public ClusterServiceVersionSpecISpecDSpecTSpecCRPTcpSocket getTcpSocket() {
-        return tcpSocket;
-    }
-
-    @JsonProperty("tcpSocket")
-    public void setTcpSocket(ClusterServiceVersionSpecISpecDSpecTSpecCRPTcpSocket tcpSocket) {
-        this.tcpSocket = tcpSocket;
-    }
-
-    @JsonProperty("terminationGracePeriodSeconds")
-    public Long getTerminationGracePeriodSeconds() {
-        return terminationGracePeriodSeconds;
-    }
-
-    @JsonProperty("terminationGracePeriodSeconds")
-    public void setTerminationGracePeriodSeconds(Long terminationGracePeriodSeconds) {
-        this.terminationGracePeriodSeconds = terminationGracePeriodSeconds;
-    }
-
-    @JsonProperty("timeoutSeconds")
-    public Integer getTimeoutSeconds() {
-        return timeoutSeconds;
-    }
-
-    @JsonProperty("timeoutSeconds")
-    public void setTimeoutSeconds(Integer timeoutSeconds) {
-        this.timeoutSeconds = timeoutSeconds;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCReadinessProbeBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecCReadinessProbeBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCReadinessProbeBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCResizePolicy.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCResizePolicy.java
deleted file mode 100644
index d7675a76858..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCResizePolicy.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "resourceName",
-    "restartPolicy"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecCResizePolicy implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecCResizePolicyBuilder> , KubernetesResource
-{
-
-    @JsonProperty("resourceName")
-    private String resourceName;
-    @JsonProperty("restartPolicy")
-    private String restartPolicy;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecCResizePolicy() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecCResizePolicy(String resourceName, String restartPolicy) {
-        super();
-        this.resourceName = resourceName;
-        this.restartPolicy = restartPolicy;
-    }
-
-    @JsonProperty("resourceName")
-    public String getResourceName() {
-        return resourceName;
-    }
-
-    @JsonProperty("resourceName")
-    public void setResourceName(String resourceName) {
-        this.resourceName = resourceName;
-    }
-
-    @JsonProperty("restartPolicy")
-    public String getRestartPolicy() {
-        return restartPolicy;
-    }
-
-    @JsonProperty("restartPolicy")
-    public void setRestartPolicy(String restartPolicy) {
-        this.restartPolicy = restartPolicy;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCResizePolicyBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecCResizePolicyBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCResizePolicyBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCResources.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCResources.java
deleted file mode 100644
index 70dc65edfa3..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCResources.java
+++ /dev/null
@@ -1,148 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "claims",
-    "limits",
-    "requests"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecCResources implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecCResourcesBuilder> , KubernetesResource
-{
-
-    @JsonProperty("claims")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecCRClaims> claims = new ArrayList<>();
-    @JsonProperty("limits")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializerForMap.class)
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, Object> limits = new LinkedHashMap<>();
-    @JsonProperty("requests")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializerForMap.class)
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, Object> requests = new LinkedHashMap<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecCResources() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecCResources(List<ClusterServiceVersionSpecISpecDSpecTSpecCRClaims> claims, Map<String, Object> limits, Map<String, Object> requests) {
-        super();
-        this.claims = claims;
-        this.limits = limits;
-        this.requests = requests;
-    }
-
-    @JsonProperty("claims")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecCRClaims> getClaims() {
-        return claims;
-    }
-
-    @JsonProperty("claims")
-    public void setClaims(List<ClusterServiceVersionSpecISpecDSpecTSpecCRClaims> claims) {
-        this.claims = claims;
-    }
-
-    @JsonProperty("limits")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, Object> getLimits() {
-        return limits;
-    }
-
-    @JsonProperty("limits")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializerForMap.class)
-    public void setLimits(Map<String, Object> limits) {
-        this.limits = limits;
-    }
-
-    @JsonProperty("requests")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, Object> getRequests() {
-        return requests;
-    }
-
-    @JsonProperty("requests")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializerForMap.class)
-    public void setRequests(Map<String, Object> requests) {
-        this.requests = requests;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCResourcesBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecCResourcesBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCResourcesBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCSCAppArmorProfile.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCSCAppArmorProfile.java
deleted file mode 100644
index 3cca2287ed0..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCSCAppArmorProfile.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "localhostProfile",
-    "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 ClusterServiceVersionSpecISpecDSpecTSpecCSCAppArmorProfile implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecCSCAppArmorProfileBuilder> , KubernetesResource
-{
-
-    @JsonProperty("localhostProfile")
-    private String localhostProfile;
-    @JsonProperty("type")
-    private String type;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSCAppArmorProfile() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSCAppArmorProfile(String localhostProfile, String type) {
-        super();
-        this.localhostProfile = localhostProfile;
-        this.type = type;
-    }
-
-    @JsonProperty("localhostProfile")
-    public String getLocalhostProfile() {
-        return localhostProfile;
-    }
-
-    @JsonProperty("localhostProfile")
-    public void setLocalhostProfile(String localhostProfile) {
-        this.localhostProfile = localhostProfile;
-    }
-
-    @JsonProperty("type")
-    public String getType() {
-        return type;
-    }
-
-    @JsonProperty("type")
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSCAppArmorProfileBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecCSCAppArmorProfileBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSCAppArmorProfileBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCSCCapabilities.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCSCCapabilities.java
deleted file mode 100644
index 5f137131125..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCSCCapabilities.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "add",
-    "drop"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecCSCCapabilities implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecCSCCapabilitiesBuilder> , KubernetesResource
-{
-
-    @JsonProperty("add")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> add = new ArrayList<>();
-    @JsonProperty("drop")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> drop = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSCCapabilities() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSCCapabilities(List<String> add, List<String> drop) {
-        super();
-        this.add = add;
-        this.drop = drop;
-    }
-
-    @JsonProperty("add")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getAdd() {
-        return add;
-    }
-
-    @JsonProperty("add")
-    public void setAdd(List<String> add) {
-        this.add = add;
-    }
-
-    @JsonProperty("drop")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getDrop() {
-        return drop;
-    }
-
-    @JsonProperty("drop")
-    public void setDrop(List<String> drop) {
-        this.drop = drop;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSCCapabilitiesBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecCSCCapabilitiesBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSCCapabilitiesBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCSCSeLinuxOptions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCSCSeLinuxOptions.java
deleted file mode 100644
index 1ba0849fe36..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCSCSeLinuxOptions.java
+++ /dev/null
@@ -1,150 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "level",
-    "role",
-    "type",
-    "user"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecCSCSeLinuxOptions implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecCSCSeLinuxOptionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("level")
-    private String level;
-    @JsonProperty("role")
-    private String role;
-    @JsonProperty("type")
-    private String type;
-    @JsonProperty("user")
-    private String user;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSCSeLinuxOptions() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSCSeLinuxOptions(String level, String role, String type, String user) {
-        super();
-        this.level = level;
-        this.role = role;
-        this.type = type;
-        this.user = user;
-    }
-
-    @JsonProperty("level")
-    public String getLevel() {
-        return level;
-    }
-
-    @JsonProperty("level")
-    public void setLevel(String level) {
-        this.level = level;
-    }
-
-    @JsonProperty("role")
-    public String getRole() {
-        return role;
-    }
-
-    @JsonProperty("role")
-    public void setRole(String role) {
-        this.role = role;
-    }
-
-    @JsonProperty("type")
-    public String getType() {
-        return type;
-    }
-
-    @JsonProperty("type")
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    @JsonProperty("user")
-    public String getUser() {
-        return user;
-    }
-
-    @JsonProperty("user")
-    public void setUser(String user) {
-        this.user = user;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSCSeLinuxOptionsBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecCSCSeLinuxOptionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSCSeLinuxOptionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCSCSeccompProfile.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCSCSeccompProfile.java
deleted file mode 100644
index 079d5dd7664..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCSCSeccompProfile.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "localhostProfile",
-    "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 ClusterServiceVersionSpecISpecDSpecTSpecCSCSeccompProfile implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecCSCSeccompProfileBuilder> , KubernetesResource
-{
-
-    @JsonProperty("localhostProfile")
-    private String localhostProfile;
-    @JsonProperty("type")
-    private String type;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSCSeccompProfile() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSCSeccompProfile(String localhostProfile, String type) {
-        super();
-        this.localhostProfile = localhostProfile;
-        this.type = type;
-    }
-
-    @JsonProperty("localhostProfile")
-    public String getLocalhostProfile() {
-        return localhostProfile;
-    }
-
-    @JsonProperty("localhostProfile")
-    public void setLocalhostProfile(String localhostProfile) {
-        this.localhostProfile = localhostProfile;
-    }
-
-    @JsonProperty("type")
-    public String getType() {
-        return type;
-    }
-
-    @JsonProperty("type")
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSCSeccompProfileBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecCSCSeccompProfileBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSCSeccompProfileBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCSCWindowsOptions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCSCWindowsOptions.java
deleted file mode 100644
index 44938d9f6f2..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCSCWindowsOptions.java
+++ /dev/null
@@ -1,150 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "gmsaCredentialSpec",
-    "gmsaCredentialSpecName",
-    "hostProcess",
-    "runAsUserName"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecCSCWindowsOptions implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecCSCWindowsOptionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("gmsaCredentialSpec")
-    private String gmsaCredentialSpec;
-    @JsonProperty("gmsaCredentialSpecName")
-    private String gmsaCredentialSpecName;
-    @JsonProperty("hostProcess")
-    private Boolean hostProcess;
-    @JsonProperty("runAsUserName")
-    private String runAsUserName;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSCWindowsOptions() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSCWindowsOptions(String gmsaCredentialSpec, String gmsaCredentialSpecName, Boolean hostProcess, String runAsUserName) {
-        super();
-        this.gmsaCredentialSpec = gmsaCredentialSpec;
-        this.gmsaCredentialSpecName = gmsaCredentialSpecName;
-        this.hostProcess = hostProcess;
-        this.runAsUserName = runAsUserName;
-    }
-
-    @JsonProperty("gmsaCredentialSpec")
-    public String getGmsaCredentialSpec() {
-        return gmsaCredentialSpec;
-    }
-
-    @JsonProperty("gmsaCredentialSpec")
-    public void setGmsaCredentialSpec(String gmsaCredentialSpec) {
-        this.gmsaCredentialSpec = gmsaCredentialSpec;
-    }
-
-    @JsonProperty("gmsaCredentialSpecName")
-    public String getGmsaCredentialSpecName() {
-        return gmsaCredentialSpecName;
-    }
-
-    @JsonProperty("gmsaCredentialSpecName")
-    public void setGmsaCredentialSpecName(String gmsaCredentialSpecName) {
-        this.gmsaCredentialSpecName = gmsaCredentialSpecName;
-    }
-
-    @JsonProperty("hostProcess")
-    public Boolean getHostProcess() {
-        return hostProcess;
-    }
-
-    @JsonProperty("hostProcess")
-    public void setHostProcess(Boolean hostProcess) {
-        this.hostProcess = hostProcess;
-    }
-
-    @JsonProperty("runAsUserName")
-    public String getRunAsUserName() {
-        return runAsUserName;
-    }
-
-    @JsonProperty("runAsUserName")
-    public void setRunAsUserName(String runAsUserName) {
-        this.runAsUserName = runAsUserName;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSCWindowsOptionsBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecCSCWindowsOptionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSCWindowsOptionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCSPExec.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCSPExec.java
deleted file mode 100644
index e73e667036e..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCSPExec.java
+++ /dev/null
@@ -1,112 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "command"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecCSPExec implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecCSPExecBuilder> , KubernetesResource
-{
-
-    @JsonProperty("command")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> command = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSPExec() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSPExec(List<String> command) {
-        super();
-        this.command = command;
-    }
-
-    @JsonProperty("command")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getCommand() {
-        return command;
-    }
-
-    @JsonProperty("command")
-    public void setCommand(List<String> command) {
-        this.command = command;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSPExecBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecCSPExecBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSPExecBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCSPGrpc.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCSPGrpc.java
deleted file mode 100644
index ade358c4e72..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCSPGrpc.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "port",
-    "service"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecCSPGrpc implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecCSPGrpcBuilder> , KubernetesResource
-{
-
-    @JsonProperty("port")
-    private Integer port;
-    @JsonProperty("service")
-    private String service;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSPGrpc() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSPGrpc(Integer port, String service) {
-        super();
-        this.port = port;
-        this.service = service;
-    }
-
-    @JsonProperty("port")
-    public Integer getPort() {
-        return port;
-    }
-
-    @JsonProperty("port")
-    public void setPort(Integer port) {
-        this.port = port;
-    }
-
-    @JsonProperty("service")
-    public String getService() {
-        return service;
-    }
-
-    @JsonProperty("service")
-    public void setService(String service) {
-        this.service = service;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSPGrpcBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecCSPGrpcBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSPGrpcBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCSPHGHttpHeaders.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCSPHGHttpHeaders.java
deleted file mode 100644
index 12db48a15e4..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCSPHGHttpHeaders.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name",
-    "value"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecCSPHGHttpHeaders implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecCSPHGHttpHeadersBuilder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("value")
-    private String value;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSPHGHttpHeaders() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSPHGHttpHeaders(String name, String value) {
-        super();
-        this.name = name;
-        this.value = value;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("value")
-    public String getValue() {
-        return value;
-    }
-
-    @JsonProperty("value")
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSPHGHttpHeadersBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecCSPHGHttpHeadersBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSPHGHttpHeadersBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCSPHttpGet.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCSPHttpGet.java
deleted file mode 100644
index 1430f9bbab1..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCSPHttpGet.java
+++ /dev/null
@@ -1,170 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "host",
-    "httpHeaders",
-    "path",
-    "port",
-    "scheme"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecCSPHttpGet implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecCSPHttpGetBuilder> , KubernetesResource
-{
-
-    @JsonProperty("host")
-    private String host;
-    @JsonProperty("httpHeaders")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecCSPHGHttpHeaders> httpHeaders = new ArrayList<>();
-    @JsonProperty("path")
-    private String path;
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object port;
-    @JsonProperty("scheme")
-    private String scheme;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSPHttpGet() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSPHttpGet(String host, List<ClusterServiceVersionSpecISpecDSpecTSpecCSPHGHttpHeaders> httpHeaders, String path, Object port, String scheme) {
-        super();
-        this.host = host;
-        this.httpHeaders = httpHeaders;
-        this.path = path;
-        this.port = port;
-        this.scheme = scheme;
-    }
-
-    @JsonProperty("host")
-    public String getHost() {
-        return host;
-    }
-
-    @JsonProperty("host")
-    public void setHost(String host) {
-        this.host = host;
-    }
-
-    @JsonProperty("httpHeaders")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecCSPHGHttpHeaders> getHttpHeaders() {
-        return httpHeaders;
-    }
-
-    @JsonProperty("httpHeaders")
-    public void setHttpHeaders(List<ClusterServiceVersionSpecISpecDSpecTSpecCSPHGHttpHeaders> httpHeaders) {
-        this.httpHeaders = httpHeaders;
-    }
-
-    @JsonProperty("path")
-    public String getPath() {
-        return path;
-    }
-
-    @JsonProperty("path")
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @JsonProperty("port")
-    public Object getPort() {
-        return port;
-    }
-
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setPort(Object port) {
-        this.port = port;
-    }
-
-    @JsonProperty("scheme")
-    public String getScheme() {
-        return scheme;
-    }
-
-    @JsonProperty("scheme")
-    public void setScheme(String scheme) {
-        this.scheme = scheme;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSPHttpGetBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecCSPHttpGetBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSPHttpGetBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCSPTcpSocket.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCSPTcpSocket.java
deleted file mode 100644
index de55087591f..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCSPTcpSocket.java
+++ /dev/null
@@ -1,124 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "host",
-    "port"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecCSPTcpSocket implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecCSPTcpSocketBuilder> , KubernetesResource
-{
-
-    @JsonProperty("host")
-    private String host;
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object port;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSPTcpSocket() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSPTcpSocket(String host, Object port) {
-        super();
-        this.host = host;
-        this.port = port;
-    }
-
-    @JsonProperty("host")
-    public String getHost() {
-        return host;
-    }
-
-    @JsonProperty("host")
-    public void setHost(String host) {
-        this.host = host;
-    }
-
-    @JsonProperty("port")
-    public Object getPort() {
-        return port;
-    }
-
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setPort(Object port) {
-        this.port = port;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSPTcpSocketBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecCSPTcpSocketBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSPTcpSocketBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCSecurityContext.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCSecurityContext.java
deleted file mode 100644
index 7eff086c04c..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCSecurityContext.java
+++ /dev/null
@@ -1,262 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "allowPrivilegeEscalation",
-    "appArmorProfile",
-    "capabilities",
-    "privileged",
-    "procMount",
-    "readOnlyRootFilesystem",
-    "runAsGroup",
-    "runAsNonRoot",
-    "runAsUser",
-    "seLinuxOptions",
-    "seccompProfile",
-    "windowsOptions"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecCSecurityContext implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecCSecurityContextBuilder> , KubernetesResource
-{
-
-    @JsonProperty("allowPrivilegeEscalation")
-    private Boolean allowPrivilegeEscalation;
-    @JsonProperty("appArmorProfile")
-    private ClusterServiceVersionSpecISpecDSpecTSpecCSCAppArmorProfile appArmorProfile;
-    @JsonProperty("capabilities")
-    private ClusterServiceVersionSpecISpecDSpecTSpecCSCCapabilities capabilities;
-    @JsonProperty("privileged")
-    private Boolean privileged;
-    @JsonProperty("procMount")
-    private String procMount;
-    @JsonProperty("readOnlyRootFilesystem")
-    private Boolean readOnlyRootFilesystem;
-    @JsonProperty("runAsGroup")
-    private Long runAsGroup;
-    @JsonProperty("runAsNonRoot")
-    private Boolean runAsNonRoot;
-    @JsonProperty("runAsUser")
-    private Long runAsUser;
-    @JsonProperty("seLinuxOptions")
-    private ClusterServiceVersionSpecISpecDSpecTSpecCSCSeLinuxOptions seLinuxOptions;
-    @JsonProperty("seccompProfile")
-    private ClusterServiceVersionSpecISpecDSpecTSpecCSCSeccompProfile seccompProfile;
-    @JsonProperty("windowsOptions")
-    private ClusterServiceVersionSpecISpecDSpecTSpecCSCWindowsOptions windowsOptions;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSecurityContext() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSecurityContext(Boolean allowPrivilegeEscalation, ClusterServiceVersionSpecISpecDSpecTSpecCSCAppArmorProfile appArmorProfile, ClusterServiceVersionSpecISpecDSpecTSpecCSCCapabilities capabilities, Boolean privileged, String procMount, Boolean readOnlyRootFilesystem, Long runAsGroup, Boolean runAsNonRoot, Long runAsUser, ClusterServiceVersionSpecISpecDSpecTSpecCSCSeLinuxOptions seLinuxOptions, ClusterServiceVersionSpecISpecDSpecTSpecCSCSeccompProfile seccompProfile, ClusterServiceVersionSpecISpecDSpecTSpecCSCWindowsOptions windowsOptions) {
-        super();
-        this.allowPrivilegeEscalation = allowPrivilegeEscalation;
-        this.appArmorProfile = appArmorProfile;
-        this.capabilities = capabilities;
-        this.privileged = privileged;
-        this.procMount = procMount;
-        this.readOnlyRootFilesystem = readOnlyRootFilesystem;
-        this.runAsGroup = runAsGroup;
-        this.runAsNonRoot = runAsNonRoot;
-        this.runAsUser = runAsUser;
-        this.seLinuxOptions = seLinuxOptions;
-        this.seccompProfile = seccompProfile;
-        this.windowsOptions = windowsOptions;
-    }
-
-    @JsonProperty("allowPrivilegeEscalation")
-    public Boolean getAllowPrivilegeEscalation() {
-        return allowPrivilegeEscalation;
-    }
-
-    @JsonProperty("allowPrivilegeEscalation")
-    public void setAllowPrivilegeEscalation(Boolean allowPrivilegeEscalation) {
-        this.allowPrivilegeEscalation = allowPrivilegeEscalation;
-    }
-
-    @JsonProperty("appArmorProfile")
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSCAppArmorProfile getAppArmorProfile() {
-        return appArmorProfile;
-    }
-
-    @JsonProperty("appArmorProfile")
-    public void setAppArmorProfile(ClusterServiceVersionSpecISpecDSpecTSpecCSCAppArmorProfile appArmorProfile) {
-        this.appArmorProfile = appArmorProfile;
-    }
-
-    @JsonProperty("capabilities")
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSCCapabilities getCapabilities() {
-        return capabilities;
-    }
-
-    @JsonProperty("capabilities")
-    public void setCapabilities(ClusterServiceVersionSpecISpecDSpecTSpecCSCCapabilities capabilities) {
-        this.capabilities = capabilities;
-    }
-
-    @JsonProperty("privileged")
-    public Boolean getPrivileged() {
-        return privileged;
-    }
-
-    @JsonProperty("privileged")
-    public void setPrivileged(Boolean privileged) {
-        this.privileged = privileged;
-    }
-
-    @JsonProperty("procMount")
-    public String getProcMount() {
-        return procMount;
-    }
-
-    @JsonProperty("procMount")
-    public void setProcMount(String procMount) {
-        this.procMount = procMount;
-    }
-
-    @JsonProperty("readOnlyRootFilesystem")
-    public Boolean getReadOnlyRootFilesystem() {
-        return readOnlyRootFilesystem;
-    }
-
-    @JsonProperty("readOnlyRootFilesystem")
-    public void setReadOnlyRootFilesystem(Boolean readOnlyRootFilesystem) {
-        this.readOnlyRootFilesystem = readOnlyRootFilesystem;
-    }
-
-    @JsonProperty("runAsGroup")
-    public Long getRunAsGroup() {
-        return runAsGroup;
-    }
-
-    @JsonProperty("runAsGroup")
-    public void setRunAsGroup(Long runAsGroup) {
-        this.runAsGroup = runAsGroup;
-    }
-
-    @JsonProperty("runAsNonRoot")
-    public Boolean getRunAsNonRoot() {
-        return runAsNonRoot;
-    }
-
-    @JsonProperty("runAsNonRoot")
-    public void setRunAsNonRoot(Boolean runAsNonRoot) {
-        this.runAsNonRoot = runAsNonRoot;
-    }
-
-    @JsonProperty("runAsUser")
-    public Long getRunAsUser() {
-        return runAsUser;
-    }
-
-    @JsonProperty("runAsUser")
-    public void setRunAsUser(Long runAsUser) {
-        this.runAsUser = runAsUser;
-    }
-
-    @JsonProperty("seLinuxOptions")
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSCSeLinuxOptions getSeLinuxOptions() {
-        return seLinuxOptions;
-    }
-
-    @JsonProperty("seLinuxOptions")
-    public void setSeLinuxOptions(ClusterServiceVersionSpecISpecDSpecTSpecCSCSeLinuxOptions seLinuxOptions) {
-        this.seLinuxOptions = seLinuxOptions;
-    }
-
-    @JsonProperty("seccompProfile")
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSCSeccompProfile getSeccompProfile() {
-        return seccompProfile;
-    }
-
-    @JsonProperty("seccompProfile")
-    public void setSeccompProfile(ClusterServiceVersionSpecISpecDSpecTSpecCSCSeccompProfile seccompProfile) {
-        this.seccompProfile = seccompProfile;
-    }
-
-    @JsonProperty("windowsOptions")
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSCWindowsOptions getWindowsOptions() {
-        return windowsOptions;
-    }
-
-    @JsonProperty("windowsOptions")
-    public void setWindowsOptions(ClusterServiceVersionSpecISpecDSpecTSpecCSCWindowsOptions windowsOptions) {
-        this.windowsOptions = windowsOptions;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSecurityContextBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecCSecurityContextBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSecurityContextBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCStartupProbe.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCStartupProbe.java
deleted file mode 100644
index 4f7b9e76e21..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCStartupProbe.java
+++ /dev/null
@@ -1,234 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "exec",
-    "failureThreshold",
-    "grpc",
-    "httpGet",
-    "initialDelaySeconds",
-    "periodSeconds",
-    "successThreshold",
-    "tcpSocket",
-    "terminationGracePeriodSeconds",
-    "timeoutSeconds"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecCStartupProbe implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecCStartupProbeBuilder> , KubernetesResource
-{
-
-    @JsonProperty("exec")
-    private ClusterServiceVersionSpecISpecDSpecTSpecCSPExec exec;
-    @JsonProperty("failureThreshold")
-    private Integer failureThreshold;
-    @JsonProperty("grpc")
-    private ClusterServiceVersionSpecISpecDSpecTSpecCSPGrpc grpc;
-    @JsonProperty("httpGet")
-    private ClusterServiceVersionSpecISpecDSpecTSpecCSPHttpGet httpGet;
-    @JsonProperty("initialDelaySeconds")
-    private Integer initialDelaySeconds;
-    @JsonProperty("periodSeconds")
-    private Integer periodSeconds;
-    @JsonProperty("successThreshold")
-    private Integer successThreshold;
-    @JsonProperty("tcpSocket")
-    private ClusterServiceVersionSpecISpecDSpecTSpecCSPTcpSocket tcpSocket;
-    @JsonProperty("terminationGracePeriodSeconds")
-    private Long terminationGracePeriodSeconds;
-    @JsonProperty("timeoutSeconds")
-    private Integer timeoutSeconds;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecCStartupProbe() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecCStartupProbe(ClusterServiceVersionSpecISpecDSpecTSpecCSPExec exec, Integer failureThreshold, ClusterServiceVersionSpecISpecDSpecTSpecCSPGrpc grpc, ClusterServiceVersionSpecISpecDSpecTSpecCSPHttpGet httpGet, Integer initialDelaySeconds, Integer periodSeconds, Integer successThreshold, ClusterServiceVersionSpecISpecDSpecTSpecCSPTcpSocket tcpSocket, Long terminationGracePeriodSeconds, Integer timeoutSeconds) {
-        super();
-        this.exec = exec;
-        this.failureThreshold = failureThreshold;
-        this.grpc = grpc;
-        this.httpGet = httpGet;
-        this.initialDelaySeconds = initialDelaySeconds;
-        this.periodSeconds = periodSeconds;
-        this.successThreshold = successThreshold;
-        this.tcpSocket = tcpSocket;
-        this.terminationGracePeriodSeconds = terminationGracePeriodSeconds;
-        this.timeoutSeconds = timeoutSeconds;
-    }
-
-    @JsonProperty("exec")
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSPExec getExec() {
-        return exec;
-    }
-
-    @JsonProperty("exec")
-    public void setExec(ClusterServiceVersionSpecISpecDSpecTSpecCSPExec exec) {
-        this.exec = exec;
-    }
-
-    @JsonProperty("failureThreshold")
-    public Integer getFailureThreshold() {
-        return failureThreshold;
-    }
-
-    @JsonProperty("failureThreshold")
-    public void setFailureThreshold(Integer failureThreshold) {
-        this.failureThreshold = failureThreshold;
-    }
-
-    @JsonProperty("grpc")
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSPGrpc getGrpc() {
-        return grpc;
-    }
-
-    @JsonProperty("grpc")
-    public void setGrpc(ClusterServiceVersionSpecISpecDSpecTSpecCSPGrpc grpc) {
-        this.grpc = grpc;
-    }
-
-    @JsonProperty("httpGet")
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSPHttpGet getHttpGet() {
-        return httpGet;
-    }
-
-    @JsonProperty("httpGet")
-    public void setHttpGet(ClusterServiceVersionSpecISpecDSpecTSpecCSPHttpGet httpGet) {
-        this.httpGet = httpGet;
-    }
-
-    @JsonProperty("initialDelaySeconds")
-    public Integer getInitialDelaySeconds() {
-        return initialDelaySeconds;
-    }
-
-    @JsonProperty("initialDelaySeconds")
-    public void setInitialDelaySeconds(Integer initialDelaySeconds) {
-        this.initialDelaySeconds = initialDelaySeconds;
-    }
-
-    @JsonProperty("periodSeconds")
-    public Integer getPeriodSeconds() {
-        return periodSeconds;
-    }
-
-    @JsonProperty("periodSeconds")
-    public void setPeriodSeconds(Integer periodSeconds) {
-        this.periodSeconds = periodSeconds;
-    }
-
-    @JsonProperty("successThreshold")
-    public Integer getSuccessThreshold() {
-        return successThreshold;
-    }
-
-    @JsonProperty("successThreshold")
-    public void setSuccessThreshold(Integer successThreshold) {
-        this.successThreshold = successThreshold;
-    }
-
-    @JsonProperty("tcpSocket")
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSPTcpSocket getTcpSocket() {
-        return tcpSocket;
-    }
-
-    @JsonProperty("tcpSocket")
-    public void setTcpSocket(ClusterServiceVersionSpecISpecDSpecTSpecCSPTcpSocket tcpSocket) {
-        this.tcpSocket = tcpSocket;
-    }
-
-    @JsonProperty("terminationGracePeriodSeconds")
-    public Long getTerminationGracePeriodSeconds() {
-        return terminationGracePeriodSeconds;
-    }
-
-    @JsonProperty("terminationGracePeriodSeconds")
-    public void setTerminationGracePeriodSeconds(Long terminationGracePeriodSeconds) {
-        this.terminationGracePeriodSeconds = terminationGracePeriodSeconds;
-    }
-
-    @JsonProperty("timeoutSeconds")
-    public Integer getTimeoutSeconds() {
-        return timeoutSeconds;
-    }
-
-    @JsonProperty("timeoutSeconds")
-    public void setTimeoutSeconds(Integer timeoutSeconds) {
-        this.timeoutSeconds = timeoutSeconds;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCStartupProbeBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecCStartupProbeBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCStartupProbeBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCVolumeMounts.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCVolumeMounts.java
deleted file mode 100644
index f57e6dde86f..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecCVolumeMounts.java
+++ /dev/null
@@ -1,192 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "mountPath",
-    "mountPropagation",
-    "name",
-    "readOnly",
-    "recursiveReadOnly",
-    "subPath",
-    "subPathExpr"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecCVolumeMounts implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecCVolumeMountsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("mountPath")
-    private String mountPath;
-    @JsonProperty("mountPropagation")
-    private String mountPropagation;
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("readOnly")
-    private Boolean readOnly;
-    @JsonProperty("recursiveReadOnly")
-    private String recursiveReadOnly;
-    @JsonProperty("subPath")
-    private String subPath;
-    @JsonProperty("subPathExpr")
-    private String subPathExpr;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecCVolumeMounts() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecCVolumeMounts(String mountPath, String mountPropagation, String name, Boolean readOnly, String recursiveReadOnly, String subPath, String subPathExpr) {
-        super();
-        this.mountPath = mountPath;
-        this.mountPropagation = mountPropagation;
-        this.name = name;
-        this.readOnly = readOnly;
-        this.recursiveReadOnly = recursiveReadOnly;
-        this.subPath = subPath;
-        this.subPathExpr = subPathExpr;
-    }
-
-    @JsonProperty("mountPath")
-    public String getMountPath() {
-        return mountPath;
-    }
-
-    @JsonProperty("mountPath")
-    public void setMountPath(String mountPath) {
-        this.mountPath = mountPath;
-    }
-
-    @JsonProperty("mountPropagation")
-    public String getMountPropagation() {
-        return mountPropagation;
-    }
-
-    @JsonProperty("mountPropagation")
-    public void setMountPropagation(String mountPropagation) {
-        this.mountPropagation = mountPropagation;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("readOnly")
-    public Boolean getReadOnly() {
-        return readOnly;
-    }
-
-    @JsonProperty("readOnly")
-    public void setReadOnly(Boolean readOnly) {
-        this.readOnly = readOnly;
-    }
-
-    @JsonProperty("recursiveReadOnly")
-    public String getRecursiveReadOnly() {
-        return recursiveReadOnly;
-    }
-
-    @JsonProperty("recursiveReadOnly")
-    public void setRecursiveReadOnly(String recursiveReadOnly) {
-        this.recursiveReadOnly = recursiveReadOnly;
-    }
-
-    @JsonProperty("subPath")
-    public String getSubPath() {
-        return subPath;
-    }
-
-    @JsonProperty("subPath")
-    public void setSubPath(String subPath) {
-        this.subPath = subPath;
-    }
-
-    @JsonProperty("subPathExpr")
-    public String getSubPathExpr() {
-        return subPathExpr;
-    }
-
-    @JsonProperty("subPathExpr")
-    public void setSubPathExpr(String subPathExpr) {
-        this.subPathExpr = subPathExpr;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCVolumeMountsBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecCVolumeMountsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecCVolumeMountsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecContainers.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecContainers.java
deleted file mode 100644
index 99283360972..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecContainers.java
+++ /dev/null
@@ -1,449 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.fabric8.kubernetes.api.model.VolumeDevice;
-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({
-    "args",
-    "command",
-    "env",
-    "envFrom",
-    "image",
-    "imagePullPolicy",
-    "lifecycle",
-    "livenessProbe",
-    "name",
-    "ports",
-    "readinessProbe",
-    "resizePolicy",
-    "resources",
-    "restartPolicy",
-    "securityContext",
-    "startupProbe",
-    "stdin",
-    "stdinOnce",
-    "terminationMessagePath",
-    "terminationMessagePolicy",
-    "tty",
-    "volumeDevices",
-    "volumeMounts",
-    "workingDir"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecContainers implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecContainersBuilder> , KubernetesResource
-{
-
-    @JsonProperty("args")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> args = new ArrayList<>();
-    @JsonProperty("command")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> command = new ArrayList<>();
-    @JsonProperty("env")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecCEnv> env = new ArrayList<>();
-    @JsonProperty("envFrom")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecCEnvFrom> envFrom = new ArrayList<>();
-    @JsonProperty("image")
-    private String image;
-    @JsonProperty("imagePullPolicy")
-    private String imagePullPolicy;
-    @JsonProperty("lifecycle")
-    private ClusterServiceVersionSpecISpecDSpecTSpecCLifecycle lifecycle;
-    @JsonProperty("livenessProbe")
-    private ClusterServiceVersionSpecISpecDSpecTSpecCLivenessProbe livenessProbe;
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("ports")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecCPorts> ports = new ArrayList<>();
-    @JsonProperty("readinessProbe")
-    private ClusterServiceVersionSpecISpecDSpecTSpecCReadinessProbe readinessProbe;
-    @JsonProperty("resizePolicy")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecCResizePolicy> resizePolicy = new ArrayList<>();
-    @JsonProperty("resources")
-    private ClusterServiceVersionSpecISpecDSpecTSpecCResources resources;
-    @JsonProperty("restartPolicy")
-    private String restartPolicy;
-    @JsonProperty("securityContext")
-    private ClusterServiceVersionSpecISpecDSpecTSpecCSecurityContext securityContext;
-    @JsonProperty("startupProbe")
-    private ClusterServiceVersionSpecISpecDSpecTSpecCStartupProbe startupProbe;
-    @JsonProperty("stdin")
-    private Boolean stdin;
-    @JsonProperty("stdinOnce")
-    private Boolean stdinOnce;
-    @JsonProperty("terminationMessagePath")
-    private String terminationMessagePath;
-    @JsonProperty("terminationMessagePolicy")
-    private String terminationMessagePolicy;
-    @JsonProperty("tty")
-    private Boolean tty;
-    @JsonProperty("volumeDevices")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<VolumeDevice> volumeDevices = new ArrayList<>();
-    @JsonProperty("volumeMounts")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecCVolumeMounts> volumeMounts = new ArrayList<>();
-    @JsonProperty("workingDir")
-    private String workingDir;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecContainers() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecContainers(List<String> args, List<String> command, List<ClusterServiceVersionSpecISpecDSpecTSpecCEnv> env, List<ClusterServiceVersionSpecISpecDSpecTSpecCEnvFrom> envFrom, String image, String imagePullPolicy, ClusterServiceVersionSpecISpecDSpecTSpecCLifecycle lifecycle, ClusterServiceVersionSpecISpecDSpecTSpecCLivenessProbe livenessProbe, String name, List<ClusterServiceVersionSpecISpecDSpecTSpecCPorts> ports, ClusterServiceVersionSpecISpecDSpecTSpecCReadinessProbe readinessProbe, List<ClusterServiceVersionSpecISpecDSpecTSpecCResizePolicy> resizePolicy, ClusterServiceVersionSpecISpecDSpecTSpecCResources resources, String restartPolicy, ClusterServiceVersionSpecISpecDSpecTSpecCSecurityContext securityContext, ClusterServiceVersionSpecISpecDSpecTSpecCStartupProbe startupProbe, Boolean stdin, Boolean stdinOnce, String terminationMessagePath, String terminationMessagePolicy, Boolean tty, List<VolumeDevice> volumeDevices, List<ClusterServiceVersionSpecISpecDSpecTSpecCVolumeMounts> volumeMounts, String workingDir) {
-        super();
-        this.args = args;
-        this.command = command;
-        this.env = env;
-        this.envFrom = envFrom;
-        this.image = image;
-        this.imagePullPolicy = imagePullPolicy;
-        this.lifecycle = lifecycle;
-        this.livenessProbe = livenessProbe;
-        this.name = name;
-        this.ports = ports;
-        this.readinessProbe = readinessProbe;
-        this.resizePolicy = resizePolicy;
-        this.resources = resources;
-        this.restartPolicy = restartPolicy;
-        this.securityContext = securityContext;
-        this.startupProbe = startupProbe;
-        this.stdin = stdin;
-        this.stdinOnce = stdinOnce;
-        this.terminationMessagePath = terminationMessagePath;
-        this.terminationMessagePolicy = terminationMessagePolicy;
-        this.tty = tty;
-        this.volumeDevices = volumeDevices;
-        this.volumeMounts = volumeMounts;
-        this.workingDir = workingDir;
-    }
-
-    @JsonProperty("args")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getArgs() {
-        return args;
-    }
-
-    @JsonProperty("args")
-    public void setArgs(List<String> args) {
-        this.args = args;
-    }
-
-    @JsonProperty("command")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getCommand() {
-        return command;
-    }
-
-    @JsonProperty("command")
-    public void setCommand(List<String> command) {
-        this.command = command;
-    }
-
-    @JsonProperty("env")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecCEnv> getEnv() {
-        return env;
-    }
-
-    @JsonProperty("env")
-    public void setEnv(List<ClusterServiceVersionSpecISpecDSpecTSpecCEnv> env) {
-        this.env = env;
-    }
-
-    @JsonProperty("envFrom")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecCEnvFrom> getEnvFrom() {
-        return envFrom;
-    }
-
-    @JsonProperty("envFrom")
-    public void setEnvFrom(List<ClusterServiceVersionSpecISpecDSpecTSpecCEnvFrom> envFrom) {
-        this.envFrom = envFrom;
-    }
-
-    @JsonProperty("image")
-    public String getImage() {
-        return image;
-    }
-
-    @JsonProperty("image")
-    public void setImage(String image) {
-        this.image = image;
-    }
-
-    @JsonProperty("imagePullPolicy")
-    public String getImagePullPolicy() {
-        return imagePullPolicy;
-    }
-
-    @JsonProperty("imagePullPolicy")
-    public void setImagePullPolicy(String imagePullPolicy) {
-        this.imagePullPolicy = imagePullPolicy;
-    }
-
-    @JsonProperty("lifecycle")
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLifecycle getLifecycle() {
-        return lifecycle;
-    }
-
-    @JsonProperty("lifecycle")
-    public void setLifecycle(ClusterServiceVersionSpecISpecDSpecTSpecCLifecycle lifecycle) {
-        this.lifecycle = lifecycle;
-    }
-
-    @JsonProperty("livenessProbe")
-    public ClusterServiceVersionSpecISpecDSpecTSpecCLivenessProbe getLivenessProbe() {
-        return livenessProbe;
-    }
-
-    @JsonProperty("livenessProbe")
-    public void setLivenessProbe(ClusterServiceVersionSpecISpecDSpecTSpecCLivenessProbe livenessProbe) {
-        this.livenessProbe = livenessProbe;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("ports")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecCPorts> getPorts() {
-        return ports;
-    }
-
-    @JsonProperty("ports")
-    public void setPorts(List<ClusterServiceVersionSpecISpecDSpecTSpecCPorts> ports) {
-        this.ports = ports;
-    }
-
-    @JsonProperty("readinessProbe")
-    public ClusterServiceVersionSpecISpecDSpecTSpecCReadinessProbe getReadinessProbe() {
-        return readinessProbe;
-    }
-
-    @JsonProperty("readinessProbe")
-    public void setReadinessProbe(ClusterServiceVersionSpecISpecDSpecTSpecCReadinessProbe readinessProbe) {
-        this.readinessProbe = readinessProbe;
-    }
-
-    @JsonProperty("resizePolicy")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecCResizePolicy> getResizePolicy() {
-        return resizePolicy;
-    }
-
-    @JsonProperty("resizePolicy")
-    public void setResizePolicy(List<ClusterServiceVersionSpecISpecDSpecTSpecCResizePolicy> resizePolicy) {
-        this.resizePolicy = resizePolicy;
-    }
-
-    @JsonProperty("resources")
-    public ClusterServiceVersionSpecISpecDSpecTSpecCResources getResources() {
-        return resources;
-    }
-
-    @JsonProperty("resources")
-    public void setResources(ClusterServiceVersionSpecISpecDSpecTSpecCResources resources) {
-        this.resources = resources;
-    }
-
-    @JsonProperty("restartPolicy")
-    public String getRestartPolicy() {
-        return restartPolicy;
-    }
-
-    @JsonProperty("restartPolicy")
-    public void setRestartPolicy(String restartPolicy) {
-        this.restartPolicy = restartPolicy;
-    }
-
-    @JsonProperty("securityContext")
-    public ClusterServiceVersionSpecISpecDSpecTSpecCSecurityContext getSecurityContext() {
-        return securityContext;
-    }
-
-    @JsonProperty("securityContext")
-    public void setSecurityContext(ClusterServiceVersionSpecISpecDSpecTSpecCSecurityContext securityContext) {
-        this.securityContext = securityContext;
-    }
-
-    @JsonProperty("startupProbe")
-    public ClusterServiceVersionSpecISpecDSpecTSpecCStartupProbe getStartupProbe() {
-        return startupProbe;
-    }
-
-    @JsonProperty("startupProbe")
-    public void setStartupProbe(ClusterServiceVersionSpecISpecDSpecTSpecCStartupProbe startupProbe) {
-        this.startupProbe = startupProbe;
-    }
-
-    @JsonProperty("stdin")
-    public Boolean getStdin() {
-        return stdin;
-    }
-
-    @JsonProperty("stdin")
-    public void setStdin(Boolean stdin) {
-        this.stdin = stdin;
-    }
-
-    @JsonProperty("stdinOnce")
-    public Boolean getStdinOnce() {
-        return stdinOnce;
-    }
-
-    @JsonProperty("stdinOnce")
-    public void setStdinOnce(Boolean stdinOnce) {
-        this.stdinOnce = stdinOnce;
-    }
-
-    @JsonProperty("terminationMessagePath")
-    public String getTerminationMessagePath() {
-        return terminationMessagePath;
-    }
-
-    @JsonProperty("terminationMessagePath")
-    public void setTerminationMessagePath(String terminationMessagePath) {
-        this.terminationMessagePath = terminationMessagePath;
-    }
-
-    @JsonProperty("terminationMessagePolicy")
-    public String getTerminationMessagePolicy() {
-        return terminationMessagePolicy;
-    }
-
-    @JsonProperty("terminationMessagePolicy")
-    public void setTerminationMessagePolicy(String terminationMessagePolicy) {
-        this.terminationMessagePolicy = terminationMessagePolicy;
-    }
-
-    @JsonProperty("tty")
-    public Boolean getTty() {
-        return tty;
-    }
-
-    @JsonProperty("tty")
-    public void setTty(Boolean tty) {
-        this.tty = tty;
-    }
-
-    @JsonProperty("volumeDevices")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<VolumeDevice> getVolumeDevices() {
-        return volumeDevices;
-    }
-
-    @JsonProperty("volumeDevices")
-    public void setVolumeDevices(List<VolumeDevice> volumeDevices) {
-        this.volumeDevices = volumeDevices;
-    }
-
-    @JsonProperty("volumeMounts")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecCVolumeMounts> getVolumeMounts() {
-        return volumeMounts;
-    }
-
-    @JsonProperty("volumeMounts")
-    public void setVolumeMounts(List<ClusterServiceVersionSpecISpecDSpecTSpecCVolumeMounts> volumeMounts) {
-        this.volumeMounts = volumeMounts;
-    }
-
-    @JsonProperty("workingDir")
-    public String getWorkingDir() {
-        return workingDir;
-    }
-
-    @JsonProperty("workingDir")
-    public void setWorkingDir(String workingDir) {
-        this.workingDir = workingDir;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecContainersBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecContainersBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecContainersBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecDnsConfig.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecDnsConfig.java
deleted file mode 100644
index 072c46abf99..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecDnsConfig.java
+++ /dev/null
@@ -1,145 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodDNSConfigOption;
-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({
-    "nameservers",
-    "options",
-    "searches"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecDnsConfig implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecDnsConfigBuilder> , KubernetesResource
-{
-
-    @JsonProperty("nameservers")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> nameservers = new ArrayList<>();
-    @JsonProperty("options")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<PodDNSConfigOption> options = new ArrayList<>();
-    @JsonProperty("searches")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> searches = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecDnsConfig() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecDnsConfig(List<String> nameservers, List<PodDNSConfigOption> options, List<String> searches) {
-        super();
-        this.nameservers = nameservers;
-        this.options = options;
-        this.searches = searches;
-    }
-
-    @JsonProperty("nameservers")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getNameservers() {
-        return nameservers;
-    }
-
-    @JsonProperty("nameservers")
-    public void setNameservers(List<String> nameservers) {
-        this.nameservers = nameservers;
-    }
-
-    @JsonProperty("options")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<PodDNSConfigOption> getOptions() {
-        return options;
-    }
-
-    @JsonProperty("options")
-    public void setOptions(List<PodDNSConfigOption> options) {
-        this.options = options;
-    }
-
-    @JsonProperty("searches")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getSearches() {
-        return searches;
-    }
-
-    @JsonProperty("searches")
-    public void setSearches(List<String> searches) {
-        this.searches = searches;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecDnsConfigBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecDnsConfigBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecDnsConfigBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECEFConfigMapRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECEFConfigMapRef.java
deleted file mode 100644
index c461d2271d5..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECEFConfigMapRef.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name",
-    "optional"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecECEFConfigMapRef implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecECEFConfigMapRefBuilder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("optional")
-    private Boolean optional;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecECEFConfigMapRef() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecECEFConfigMapRef(String name, Boolean optional) {
-        super();
-        this.name = name;
-        this.optional = optional;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("optional")
-    public Boolean getOptional() {
-        return optional;
-    }
-
-    @JsonProperty("optional")
-    public void setOptional(Boolean optional) {
-        this.optional = optional;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECEFConfigMapRefBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecECEFConfigMapRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECEFConfigMapRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECEFSecretRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECEFSecretRef.java
deleted file mode 100644
index b93b786cb90..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECEFSecretRef.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name",
-    "optional"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecECEFSecretRef implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecECEFSecretRefBuilder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("optional")
-    private Boolean optional;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecECEFSecretRef() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecECEFSecretRef(String name, Boolean optional) {
-        super();
-        this.name = name;
-        this.optional = optional;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("optional")
-    public Boolean getOptional() {
-        return optional;
-    }
-
-    @JsonProperty("optional")
-    public void setOptional(Boolean optional) {
-        this.optional = optional;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECEFSecretRefBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecECEFSecretRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECEFSecretRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECEVFConfigMapKeyRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECEVFConfigMapKeyRef.java
deleted file mode 100644
index dfe89448287..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECEVFConfigMapKeyRef.java
+++ /dev/null
@@ -1,136 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "name",
-    "optional"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecECEVFConfigMapKeyRef implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecECEVFConfigMapKeyRefBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("optional")
-    private Boolean optional;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecECEVFConfigMapKeyRef() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecECEVFConfigMapKeyRef(String key, String name, Boolean optional) {
-        super();
-        this.key = key;
-        this.name = name;
-        this.optional = optional;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("optional")
-    public Boolean getOptional() {
-        return optional;
-    }
-
-    @JsonProperty("optional")
-    public void setOptional(Boolean optional) {
-        this.optional = optional;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECEVFConfigMapKeyRefBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecECEVFConfigMapKeyRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECEVFConfigMapKeyRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECEVFFieldRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECEVFFieldRef.java
deleted file mode 100644
index 82a47608569..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECEVFFieldRef.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "apiVersion",
-    "fieldPath"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecECEVFFieldRef implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecECEVFFieldRefBuilder> , KubernetesResource
-{
-
-    @JsonProperty("apiVersion")
-    private String apiVersion;
-    @JsonProperty("fieldPath")
-    private String fieldPath;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecECEVFFieldRef() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecECEVFFieldRef(String apiVersion, String fieldPath) {
-        super();
-        this.apiVersion = apiVersion;
-        this.fieldPath = fieldPath;
-    }
-
-    @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;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECEVFFieldRefBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecECEVFFieldRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECEVFFieldRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECEVFResourceFieldRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECEVFResourceFieldRef.java
deleted file mode 100644
index cbd4e6fddd6..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECEVFResourceFieldRef.java
+++ /dev/null
@@ -1,138 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "containerName",
-    "divisor",
-    "resource"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecECEVFResourceFieldRef implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecECEVFResourceFieldRefBuilder> , KubernetesResource
-{
-
-    @JsonProperty("containerName")
-    private String containerName;
-    @JsonProperty("divisor")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object divisor;
-    @JsonProperty("resource")
-    private String resource;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecECEVFResourceFieldRef() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecECEVFResourceFieldRef(String containerName, Object divisor, String resource) {
-        super();
-        this.containerName = containerName;
-        this.divisor = divisor;
-        this.resource = resource;
-    }
-
-    @JsonProperty("containerName")
-    public String getContainerName() {
-        return containerName;
-    }
-
-    @JsonProperty("containerName")
-    public void setContainerName(String containerName) {
-        this.containerName = containerName;
-    }
-
-    @JsonProperty("divisor")
-    public Object getDivisor() {
-        return divisor;
-    }
-
-    @JsonProperty("divisor")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setDivisor(Object divisor) {
-        this.divisor = divisor;
-    }
-
-    @JsonProperty("resource")
-    public String getResource() {
-        return resource;
-    }
-
-    @JsonProperty("resource")
-    public void setResource(String resource) {
-        this.resource = resource;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECEVFResourceFieldRefBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecECEVFResourceFieldRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECEVFResourceFieldRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECEVFSecretKeyRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECEVFSecretKeyRef.java
deleted file mode 100644
index 593fd507b5a..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECEVFSecretKeyRef.java
+++ /dev/null
@@ -1,136 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "name",
-    "optional"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecECEVFSecretKeyRef implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecECEVFSecretKeyRefBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("optional")
-    private Boolean optional;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecECEVFSecretKeyRef() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecECEVFSecretKeyRef(String key, String name, Boolean optional) {
-        super();
-        this.key = key;
-        this.name = name;
-        this.optional = optional;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("optional")
-    public Boolean getOptional() {
-        return optional;
-    }
-
-    @JsonProperty("optional")
-    public void setOptional(Boolean optional) {
-        this.optional = optional;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECEVFSecretKeyRefBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecECEVFSecretKeyRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECEVFSecretKeyRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECEValueFrom.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECEValueFrom.java
deleted file mode 100644
index 91137b8a0fb..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECEValueFrom.java
+++ /dev/null
@@ -1,150 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "configMapKeyRef",
-    "fieldRef",
-    "resourceFieldRef",
-    "secretKeyRef"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecECEValueFrom implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecECEValueFromBuilder> , KubernetesResource
-{
-
-    @JsonProperty("configMapKeyRef")
-    private ClusterServiceVersionSpecISpecDSpecTSpecECEVFConfigMapKeyRef configMapKeyRef;
-    @JsonProperty("fieldRef")
-    private ClusterServiceVersionSpecISpecDSpecTSpecECEVFFieldRef fieldRef;
-    @JsonProperty("resourceFieldRef")
-    private ClusterServiceVersionSpecISpecDSpecTSpecECEVFResourceFieldRef resourceFieldRef;
-    @JsonProperty("secretKeyRef")
-    private ClusterServiceVersionSpecISpecDSpecTSpecECEVFSecretKeyRef secretKeyRef;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecECEValueFrom() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecECEValueFrom(ClusterServiceVersionSpecISpecDSpecTSpecECEVFConfigMapKeyRef configMapKeyRef, ClusterServiceVersionSpecISpecDSpecTSpecECEVFFieldRef fieldRef, ClusterServiceVersionSpecISpecDSpecTSpecECEVFResourceFieldRef resourceFieldRef, ClusterServiceVersionSpecISpecDSpecTSpecECEVFSecretKeyRef secretKeyRef) {
-        super();
-        this.configMapKeyRef = configMapKeyRef;
-        this.fieldRef = fieldRef;
-        this.resourceFieldRef = resourceFieldRef;
-        this.secretKeyRef = secretKeyRef;
-    }
-
-    @JsonProperty("configMapKeyRef")
-    public ClusterServiceVersionSpecISpecDSpecTSpecECEVFConfigMapKeyRef getConfigMapKeyRef() {
-        return configMapKeyRef;
-    }
-
-    @JsonProperty("configMapKeyRef")
-    public void setConfigMapKeyRef(ClusterServiceVersionSpecISpecDSpecTSpecECEVFConfigMapKeyRef configMapKeyRef) {
-        this.configMapKeyRef = configMapKeyRef;
-    }
-
-    @JsonProperty("fieldRef")
-    public ClusterServiceVersionSpecISpecDSpecTSpecECEVFFieldRef getFieldRef() {
-        return fieldRef;
-    }
-
-    @JsonProperty("fieldRef")
-    public void setFieldRef(ClusterServiceVersionSpecISpecDSpecTSpecECEVFFieldRef fieldRef) {
-        this.fieldRef = fieldRef;
-    }
-
-    @JsonProperty("resourceFieldRef")
-    public ClusterServiceVersionSpecISpecDSpecTSpecECEVFResourceFieldRef getResourceFieldRef() {
-        return resourceFieldRef;
-    }
-
-    @JsonProperty("resourceFieldRef")
-    public void setResourceFieldRef(ClusterServiceVersionSpecISpecDSpecTSpecECEVFResourceFieldRef resourceFieldRef) {
-        this.resourceFieldRef = resourceFieldRef;
-    }
-
-    @JsonProperty("secretKeyRef")
-    public ClusterServiceVersionSpecISpecDSpecTSpecECEVFSecretKeyRef getSecretKeyRef() {
-        return secretKeyRef;
-    }
-
-    @JsonProperty("secretKeyRef")
-    public void setSecretKeyRef(ClusterServiceVersionSpecISpecDSpecTSpecECEVFSecretKeyRef secretKeyRef) {
-        this.secretKeyRef = secretKeyRef;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECEValueFromBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecECEValueFromBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECEValueFromBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECEnv.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECEnv.java
deleted file mode 100644
index 2751e991cd4..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECEnv.java
+++ /dev/null
@@ -1,136 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name",
-    "value",
-    "valueFrom"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecECEnv implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecECEnvBuilder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("value")
-    private String value;
-    @JsonProperty("valueFrom")
-    private ClusterServiceVersionSpecISpecDSpecTSpecECEValueFrom valueFrom;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecECEnv() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecECEnv(String name, String value, ClusterServiceVersionSpecISpecDSpecTSpecECEValueFrom valueFrom) {
-        super();
-        this.name = name;
-        this.value = value;
-        this.valueFrom = valueFrom;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("value")
-    public String getValue() {
-        return value;
-    }
-
-    @JsonProperty("value")
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    @JsonProperty("valueFrom")
-    public ClusterServiceVersionSpecISpecDSpecTSpecECEValueFrom getValueFrom() {
-        return valueFrom;
-    }
-
-    @JsonProperty("valueFrom")
-    public void setValueFrom(ClusterServiceVersionSpecISpecDSpecTSpecECEValueFrom valueFrom) {
-        this.valueFrom = valueFrom;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECEnvBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecECEnvBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECEnvBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECEnvFrom.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECEnvFrom.java
deleted file mode 100644
index 63c4138e22c..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECEnvFrom.java
+++ /dev/null
@@ -1,136 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "configMapRef",
-    "prefix",
-    "secretRef"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecECEnvFrom implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecECEnvFromBuilder> , KubernetesResource
-{
-
-    @JsonProperty("configMapRef")
-    private ClusterServiceVersionSpecISpecDSpecTSpecECEFConfigMapRef configMapRef;
-    @JsonProperty("prefix")
-    private String prefix;
-    @JsonProperty("secretRef")
-    private ClusterServiceVersionSpecISpecDSpecTSpecECEFSecretRef secretRef;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecECEnvFrom() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecECEnvFrom(ClusterServiceVersionSpecISpecDSpecTSpecECEFConfigMapRef configMapRef, String prefix, ClusterServiceVersionSpecISpecDSpecTSpecECEFSecretRef secretRef) {
-        super();
-        this.configMapRef = configMapRef;
-        this.prefix = prefix;
-        this.secretRef = secretRef;
-    }
-
-    @JsonProperty("configMapRef")
-    public ClusterServiceVersionSpecISpecDSpecTSpecECEFConfigMapRef getConfigMapRef() {
-        return configMapRef;
-    }
-
-    @JsonProperty("configMapRef")
-    public void setConfigMapRef(ClusterServiceVersionSpecISpecDSpecTSpecECEFConfigMapRef configMapRef) {
-        this.configMapRef = configMapRef;
-    }
-
-    @JsonProperty("prefix")
-    public String getPrefix() {
-        return prefix;
-    }
-
-    @JsonProperty("prefix")
-    public void setPrefix(String prefix) {
-        this.prefix = prefix;
-    }
-
-    @JsonProperty("secretRef")
-    public ClusterServiceVersionSpecISpecDSpecTSpecECEFSecretRef getSecretRef() {
-        return secretRef;
-    }
-
-    @JsonProperty("secretRef")
-    public void setSecretRef(ClusterServiceVersionSpecISpecDSpecTSpecECEFSecretRef secretRef) {
-        this.secretRef = secretRef;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECEnvFromBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecECEnvFromBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECEnvFromBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLPExec.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLPExec.java
deleted file mode 100644
index 5db632dab2b..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLPExec.java
+++ /dev/null
@@ -1,112 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "command"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecECLPExec implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecECLPExecBuilder> , KubernetesResource
-{
-
-    @JsonProperty("command")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> command = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPExec() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPExec(List<String> command) {
-        super();
-        this.command = command;
-    }
-
-    @JsonProperty("command")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getCommand() {
-        return command;
-    }
-
-    @JsonProperty("command")
-    public void setCommand(List<String> command) {
-        this.command = command;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPExecBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecECLPExecBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPExecBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLPGrpc.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLPGrpc.java
deleted file mode 100644
index 9266dc50988..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLPGrpc.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "port",
-    "service"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecECLPGrpc implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecECLPGrpcBuilder> , KubernetesResource
-{
-
-    @JsonProperty("port")
-    private Integer port;
-    @JsonProperty("service")
-    private String service;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPGrpc() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPGrpc(Integer port, String service) {
-        super();
-        this.port = port;
-        this.service = service;
-    }
-
-    @JsonProperty("port")
-    public Integer getPort() {
-        return port;
-    }
-
-    @JsonProperty("port")
-    public void setPort(Integer port) {
-        this.port = port;
-    }
-
-    @JsonProperty("service")
-    public String getService() {
-        return service;
-    }
-
-    @JsonProperty("service")
-    public void setService(String service) {
-        this.service = service;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPGrpcBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecECLPGrpcBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPGrpcBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLPHGHttpHeaders.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLPHGHttpHeaders.java
deleted file mode 100644
index 10121f35ccc..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLPHGHttpHeaders.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name",
-    "value"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecECLPHGHttpHeaders implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecECLPHGHttpHeadersBuilder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("value")
-    private String value;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPHGHttpHeaders() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPHGHttpHeaders(String name, String value) {
-        super();
-        this.name = name;
-        this.value = value;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("value")
-    public String getValue() {
-        return value;
-    }
-
-    @JsonProperty("value")
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPHGHttpHeadersBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecECLPHGHttpHeadersBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPHGHttpHeadersBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLPHttpGet.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLPHttpGet.java
deleted file mode 100644
index 0bfae7be11a..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLPHttpGet.java
+++ /dev/null
@@ -1,170 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "host",
-    "httpHeaders",
-    "path",
-    "port",
-    "scheme"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecECLPHttpGet implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecECLPHttpGetBuilder> , KubernetesResource
-{
-
-    @JsonProperty("host")
-    private String host;
-    @JsonProperty("httpHeaders")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecECLPHGHttpHeaders> httpHeaders = new ArrayList<>();
-    @JsonProperty("path")
-    private String path;
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object port;
-    @JsonProperty("scheme")
-    private String scheme;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPHttpGet() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPHttpGet(String host, List<ClusterServiceVersionSpecISpecDSpecTSpecECLPHGHttpHeaders> httpHeaders, String path, Object port, String scheme) {
-        super();
-        this.host = host;
-        this.httpHeaders = httpHeaders;
-        this.path = path;
-        this.port = port;
-        this.scheme = scheme;
-    }
-
-    @JsonProperty("host")
-    public String getHost() {
-        return host;
-    }
-
-    @JsonProperty("host")
-    public void setHost(String host) {
-        this.host = host;
-    }
-
-    @JsonProperty("httpHeaders")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecECLPHGHttpHeaders> getHttpHeaders() {
-        return httpHeaders;
-    }
-
-    @JsonProperty("httpHeaders")
-    public void setHttpHeaders(List<ClusterServiceVersionSpecISpecDSpecTSpecECLPHGHttpHeaders> httpHeaders) {
-        this.httpHeaders = httpHeaders;
-    }
-
-    @JsonProperty("path")
-    public String getPath() {
-        return path;
-    }
-
-    @JsonProperty("path")
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @JsonProperty("port")
-    public Object getPort() {
-        return port;
-    }
-
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setPort(Object port) {
-        this.port = port;
-    }
-
-    @JsonProperty("scheme")
-    public String getScheme() {
-        return scheme;
-    }
-
-    @JsonProperty("scheme")
-    public void setScheme(String scheme) {
-        this.scheme = scheme;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPHttpGetBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecECLPHttpGetBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPHttpGetBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLPSExec.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLPSExec.java
deleted file mode 100644
index 1c23205ad7b..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLPSExec.java
+++ /dev/null
@@ -1,112 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "command"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecECLPSExec implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecECLPSExecBuilder> , KubernetesResource
-{
-
-    @JsonProperty("command")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> command = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPSExec() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPSExec(List<String> command) {
-        super();
-        this.command = command;
-    }
-
-    @JsonProperty("command")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getCommand() {
-        return command;
-    }
-
-    @JsonProperty("command")
-    public void setCommand(List<String> command) {
-        this.command = command;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPSExecBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecECLPSExecBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPSExecBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLPSExec_1.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLPSExec_1.java
deleted file mode 100644
index 1e0505de2e6..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLPSExec_1.java
+++ /dev/null
@@ -1,112 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "command"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecECLPSExec_1 implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecECLPSExec_1Builder> , KubernetesResource
-{
-
-    @JsonProperty("command")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> command = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPSExec_1() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPSExec_1(List<String> command) {
-        super();
-        this.command = command;
-    }
-
-    @JsonProperty("command")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getCommand() {
-        return command;
-    }
-
-    @JsonProperty("command")
-    public void setCommand(List<String> command) {
-        this.command = command;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPSExec_1Builder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecECLPSExec_1Builder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPSExec_1Builder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLPSHGHttpHeaders.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLPSHGHttpHeaders.java
deleted file mode 100644
index 748b907733f..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLPSHGHttpHeaders.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name",
-    "value"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecECLPSHGHttpHeaders implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecECLPSHGHttpHeadersBuilder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("value")
-    private String value;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPSHGHttpHeaders() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPSHGHttpHeaders(String name, String value) {
-        super();
-        this.name = name;
-        this.value = value;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("value")
-    public String getValue() {
-        return value;
-    }
-
-    @JsonProperty("value")
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPSHGHttpHeadersBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecECLPSHGHttpHeadersBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPSHGHttpHeadersBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLPSHGHttpHeaders_1.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLPSHGHttpHeaders_1.java
deleted file mode 100644
index 304ee4a4948..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLPSHGHttpHeaders_1.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name",
-    "value"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecECLPSHGHttpHeaders_1 implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecECLPSHGHttpHeaders_1Builder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("value")
-    private String value;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPSHGHttpHeaders_1() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPSHGHttpHeaders_1(String name, String value) {
-        super();
-        this.name = name;
-        this.value = value;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("value")
-    public String getValue() {
-        return value;
-    }
-
-    @JsonProperty("value")
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPSHGHttpHeaders_1Builder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecECLPSHGHttpHeaders_1Builder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPSHGHttpHeaders_1Builder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLPSHttpGet.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLPSHttpGet.java
deleted file mode 100644
index bd7f60ff3ba..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLPSHttpGet.java
+++ /dev/null
@@ -1,170 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "host",
-    "httpHeaders",
-    "path",
-    "port",
-    "scheme"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecECLPSHttpGet implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecECLPSHttpGetBuilder> , KubernetesResource
-{
-
-    @JsonProperty("host")
-    private String host;
-    @JsonProperty("httpHeaders")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecECLPSHGHttpHeaders> httpHeaders = new ArrayList<>();
-    @JsonProperty("path")
-    private String path;
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object port;
-    @JsonProperty("scheme")
-    private String scheme;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPSHttpGet() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPSHttpGet(String host, List<ClusterServiceVersionSpecISpecDSpecTSpecECLPSHGHttpHeaders> httpHeaders, String path, Object port, String scheme) {
-        super();
-        this.host = host;
-        this.httpHeaders = httpHeaders;
-        this.path = path;
-        this.port = port;
-        this.scheme = scheme;
-    }
-
-    @JsonProperty("host")
-    public String getHost() {
-        return host;
-    }
-
-    @JsonProperty("host")
-    public void setHost(String host) {
-        this.host = host;
-    }
-
-    @JsonProperty("httpHeaders")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecECLPSHGHttpHeaders> getHttpHeaders() {
-        return httpHeaders;
-    }
-
-    @JsonProperty("httpHeaders")
-    public void setHttpHeaders(List<ClusterServiceVersionSpecISpecDSpecTSpecECLPSHGHttpHeaders> httpHeaders) {
-        this.httpHeaders = httpHeaders;
-    }
-
-    @JsonProperty("path")
-    public String getPath() {
-        return path;
-    }
-
-    @JsonProperty("path")
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @JsonProperty("port")
-    public Object getPort() {
-        return port;
-    }
-
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setPort(Object port) {
-        this.port = port;
-    }
-
-    @JsonProperty("scheme")
-    public String getScheme() {
-        return scheme;
-    }
-
-    @JsonProperty("scheme")
-    public void setScheme(String scheme) {
-        this.scheme = scheme;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPSHttpGetBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecECLPSHttpGetBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPSHttpGetBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLPSHttpGet_1.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLPSHttpGet_1.java
deleted file mode 100644
index eb514a27957..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLPSHttpGet_1.java
+++ /dev/null
@@ -1,170 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "host",
-    "httpHeaders",
-    "path",
-    "port",
-    "scheme"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecECLPSHttpGet_1 implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecECLPSHttpGet_1Builder> , KubernetesResource
-{
-
-    @JsonProperty("host")
-    private String host;
-    @JsonProperty("httpHeaders")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecECLPSHGHttpHeaders_1> httpHeaders = new ArrayList<>();
-    @JsonProperty("path")
-    private String path;
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object port;
-    @JsonProperty("scheme")
-    private String scheme;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPSHttpGet_1() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPSHttpGet_1(String host, List<ClusterServiceVersionSpecISpecDSpecTSpecECLPSHGHttpHeaders_1> httpHeaders, String path, Object port, String scheme) {
-        super();
-        this.host = host;
-        this.httpHeaders = httpHeaders;
-        this.path = path;
-        this.port = port;
-        this.scheme = scheme;
-    }
-
-    @JsonProperty("host")
-    public String getHost() {
-        return host;
-    }
-
-    @JsonProperty("host")
-    public void setHost(String host) {
-        this.host = host;
-    }
-
-    @JsonProperty("httpHeaders")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecECLPSHGHttpHeaders_1> getHttpHeaders() {
-        return httpHeaders;
-    }
-
-    @JsonProperty("httpHeaders")
-    public void setHttpHeaders(List<ClusterServiceVersionSpecISpecDSpecTSpecECLPSHGHttpHeaders_1> httpHeaders) {
-        this.httpHeaders = httpHeaders;
-    }
-
-    @JsonProperty("path")
-    public String getPath() {
-        return path;
-    }
-
-    @JsonProperty("path")
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @JsonProperty("port")
-    public Object getPort() {
-        return port;
-    }
-
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setPort(Object port) {
-        this.port = port;
-    }
-
-    @JsonProperty("scheme")
-    public String getScheme() {
-        return scheme;
-    }
-
-    @JsonProperty("scheme")
-    public void setScheme(String scheme) {
-        this.scheme = scheme;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPSHttpGet_1Builder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecECLPSHttpGet_1Builder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPSHttpGet_1Builder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLPSSleep.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLPSSleep.java
deleted file mode 100644
index dac0a520e6b..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLPSSleep.java
+++ /dev/null
@@ -1,108 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "seconds"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecECLPSSleep implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecECLPSSleepBuilder> , KubernetesResource
-{
-
-    @JsonProperty("seconds")
-    private Long seconds;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPSSleep() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPSSleep(Long seconds) {
-        super();
-        this.seconds = seconds;
-    }
-
-    @JsonProperty("seconds")
-    public Long getSeconds() {
-        return seconds;
-    }
-
-    @JsonProperty("seconds")
-    public void setSeconds(Long seconds) {
-        this.seconds = seconds;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPSSleepBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecECLPSSleepBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPSSleepBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLPSSleep_1.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLPSSleep_1.java
deleted file mode 100644
index aa56369d628..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLPSSleep_1.java
+++ /dev/null
@@ -1,108 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "seconds"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecECLPSSleep_1 implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecECLPSSleep_1Builder> , KubernetesResource
-{
-
-    @JsonProperty("seconds")
-    private Long seconds;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPSSleep_1() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPSSleep_1(Long seconds) {
-        super();
-        this.seconds = seconds;
-    }
-
-    @JsonProperty("seconds")
-    public Long getSeconds() {
-        return seconds;
-    }
-
-    @JsonProperty("seconds")
-    public void setSeconds(Long seconds) {
-        this.seconds = seconds;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPSSleep_1Builder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecECLPSSleep_1Builder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPSSleep_1Builder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLPSTcpSocket.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLPSTcpSocket.java
deleted file mode 100644
index ce8513d9b17..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLPSTcpSocket.java
+++ /dev/null
@@ -1,124 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "host",
-    "port"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecECLPSTcpSocket implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecECLPSTcpSocketBuilder> , KubernetesResource
-{
-
-    @JsonProperty("host")
-    private String host;
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object port;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPSTcpSocket() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPSTcpSocket(String host, Object port) {
-        super();
-        this.host = host;
-        this.port = port;
-    }
-
-    @JsonProperty("host")
-    public String getHost() {
-        return host;
-    }
-
-    @JsonProperty("host")
-    public void setHost(String host) {
-        this.host = host;
-    }
-
-    @JsonProperty("port")
-    public Object getPort() {
-        return port;
-    }
-
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setPort(Object port) {
-        this.port = port;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPSTcpSocketBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecECLPSTcpSocketBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPSTcpSocketBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLPSTcpSocket_1.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLPSTcpSocket_1.java
deleted file mode 100644
index 96595dc9507..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLPSTcpSocket_1.java
+++ /dev/null
@@ -1,124 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "host",
-    "port"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecECLPSTcpSocket_1 implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecECLPSTcpSocket_1Builder> , KubernetesResource
-{
-
-    @JsonProperty("host")
-    private String host;
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object port;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPSTcpSocket_1() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPSTcpSocket_1(String host, Object port) {
-        super();
-        this.host = host;
-        this.port = port;
-    }
-
-    @JsonProperty("host")
-    public String getHost() {
-        return host;
-    }
-
-    @JsonProperty("host")
-    public void setHost(String host) {
-        this.host = host;
-    }
-
-    @JsonProperty("port")
-    public Object getPort() {
-        return port;
-    }
-
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setPort(Object port) {
-        this.port = port;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPSTcpSocket_1Builder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecECLPSTcpSocket_1Builder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPSTcpSocket_1Builder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLPTcpSocket.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLPTcpSocket.java
deleted file mode 100644
index a4c15752ca9..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLPTcpSocket.java
+++ /dev/null
@@ -1,124 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "host",
-    "port"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecECLPTcpSocket implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecECLPTcpSocketBuilder> , KubernetesResource
-{
-
-    @JsonProperty("host")
-    private String host;
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object port;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPTcpSocket() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPTcpSocket(String host, Object port) {
-        super();
-        this.host = host;
-        this.port = port;
-    }
-
-    @JsonProperty("host")
-    public String getHost() {
-        return host;
-    }
-
-    @JsonProperty("host")
-    public void setHost(String host) {
-        this.host = host;
-    }
-
-    @JsonProperty("port")
-    public Object getPort() {
-        return port;
-    }
-
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setPort(Object port) {
-        this.port = port;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPTcpSocketBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecECLPTcpSocketBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPTcpSocketBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLPostStart.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLPostStart.java
deleted file mode 100644
index 8c5b0501141..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLPostStart.java
+++ /dev/null
@@ -1,150 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "exec",
-    "httpGet",
-    "sleep",
-    "tcpSocket"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecECLPostStart implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecECLPostStartBuilder> , KubernetesResource
-{
-
-    @JsonProperty("exec")
-    private ClusterServiceVersionSpecISpecDSpecTSpecECLPSExec exec;
-    @JsonProperty("httpGet")
-    private ClusterServiceVersionSpecISpecDSpecTSpecECLPSHttpGet httpGet;
-    @JsonProperty("sleep")
-    private ClusterServiceVersionSpecISpecDSpecTSpecECLPSSleep sleep;
-    @JsonProperty("tcpSocket")
-    private ClusterServiceVersionSpecISpecDSpecTSpecECLPSTcpSocket tcpSocket;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPostStart() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPostStart(ClusterServiceVersionSpecISpecDSpecTSpecECLPSExec exec, ClusterServiceVersionSpecISpecDSpecTSpecECLPSHttpGet httpGet, ClusterServiceVersionSpecISpecDSpecTSpecECLPSSleep sleep, ClusterServiceVersionSpecISpecDSpecTSpecECLPSTcpSocket tcpSocket) {
-        super();
-        this.exec = exec;
-        this.httpGet = httpGet;
-        this.sleep = sleep;
-        this.tcpSocket = tcpSocket;
-    }
-
-    @JsonProperty("exec")
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPSExec getExec() {
-        return exec;
-    }
-
-    @JsonProperty("exec")
-    public void setExec(ClusterServiceVersionSpecISpecDSpecTSpecECLPSExec exec) {
-        this.exec = exec;
-    }
-
-    @JsonProperty("httpGet")
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPSHttpGet getHttpGet() {
-        return httpGet;
-    }
-
-    @JsonProperty("httpGet")
-    public void setHttpGet(ClusterServiceVersionSpecISpecDSpecTSpecECLPSHttpGet httpGet) {
-        this.httpGet = httpGet;
-    }
-
-    @JsonProperty("sleep")
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPSSleep getSleep() {
-        return sleep;
-    }
-
-    @JsonProperty("sleep")
-    public void setSleep(ClusterServiceVersionSpecISpecDSpecTSpecECLPSSleep sleep) {
-        this.sleep = sleep;
-    }
-
-    @JsonProperty("tcpSocket")
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPSTcpSocket getTcpSocket() {
-        return tcpSocket;
-    }
-
-    @JsonProperty("tcpSocket")
-    public void setTcpSocket(ClusterServiceVersionSpecISpecDSpecTSpecECLPSTcpSocket tcpSocket) {
-        this.tcpSocket = tcpSocket;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPostStartBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecECLPostStartBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPostStartBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLPreStop.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLPreStop.java
deleted file mode 100644
index 2ed4247da80..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLPreStop.java
+++ /dev/null
@@ -1,150 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "exec",
-    "httpGet",
-    "sleep",
-    "tcpSocket"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecECLPreStop implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecECLPreStopBuilder> , KubernetesResource
-{
-
-    @JsonProperty("exec")
-    private ClusterServiceVersionSpecISpecDSpecTSpecECLPSExec_1 exec;
-    @JsonProperty("httpGet")
-    private ClusterServiceVersionSpecISpecDSpecTSpecECLPSHttpGet_1 httpGet;
-    @JsonProperty("sleep")
-    private ClusterServiceVersionSpecISpecDSpecTSpecECLPSSleep_1 sleep;
-    @JsonProperty("tcpSocket")
-    private ClusterServiceVersionSpecISpecDSpecTSpecECLPSTcpSocket_1 tcpSocket;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPreStop() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPreStop(ClusterServiceVersionSpecISpecDSpecTSpecECLPSExec_1 exec, ClusterServiceVersionSpecISpecDSpecTSpecECLPSHttpGet_1 httpGet, ClusterServiceVersionSpecISpecDSpecTSpecECLPSSleep_1 sleep, ClusterServiceVersionSpecISpecDSpecTSpecECLPSTcpSocket_1 tcpSocket) {
-        super();
-        this.exec = exec;
-        this.httpGet = httpGet;
-        this.sleep = sleep;
-        this.tcpSocket = tcpSocket;
-    }
-
-    @JsonProperty("exec")
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPSExec_1 getExec() {
-        return exec;
-    }
-
-    @JsonProperty("exec")
-    public void setExec(ClusterServiceVersionSpecISpecDSpecTSpecECLPSExec_1 exec) {
-        this.exec = exec;
-    }
-
-    @JsonProperty("httpGet")
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPSHttpGet_1 getHttpGet() {
-        return httpGet;
-    }
-
-    @JsonProperty("httpGet")
-    public void setHttpGet(ClusterServiceVersionSpecISpecDSpecTSpecECLPSHttpGet_1 httpGet) {
-        this.httpGet = httpGet;
-    }
-
-    @JsonProperty("sleep")
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPSSleep_1 getSleep() {
-        return sleep;
-    }
-
-    @JsonProperty("sleep")
-    public void setSleep(ClusterServiceVersionSpecISpecDSpecTSpecECLPSSleep_1 sleep) {
-        this.sleep = sleep;
-    }
-
-    @JsonProperty("tcpSocket")
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPSTcpSocket_1 getTcpSocket() {
-        return tcpSocket;
-    }
-
-    @JsonProperty("tcpSocket")
-    public void setTcpSocket(ClusterServiceVersionSpecISpecDSpecTSpecECLPSTcpSocket_1 tcpSocket) {
-        this.tcpSocket = tcpSocket;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPreStopBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecECLPreStopBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPreStopBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLifecycle.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLifecycle.java
deleted file mode 100644
index 5d3d103a998..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLifecycle.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "postStart",
-    "preStop"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecECLifecycle implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecECLifecycleBuilder> , KubernetesResource
-{
-
-    @JsonProperty("postStart")
-    private ClusterServiceVersionSpecISpecDSpecTSpecECLPostStart postStart;
-    @JsonProperty("preStop")
-    private ClusterServiceVersionSpecISpecDSpecTSpecECLPreStop preStop;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLifecycle() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLifecycle(ClusterServiceVersionSpecISpecDSpecTSpecECLPostStart postStart, ClusterServiceVersionSpecISpecDSpecTSpecECLPreStop preStop) {
-        super();
-        this.postStart = postStart;
-        this.preStop = preStop;
-    }
-
-    @JsonProperty("postStart")
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPostStart getPostStart() {
-        return postStart;
-    }
-
-    @JsonProperty("postStart")
-    public void setPostStart(ClusterServiceVersionSpecISpecDSpecTSpecECLPostStart postStart) {
-        this.postStart = postStart;
-    }
-
-    @JsonProperty("preStop")
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPreStop getPreStop() {
-        return preStop;
-    }
-
-    @JsonProperty("preStop")
-    public void setPreStop(ClusterServiceVersionSpecISpecDSpecTSpecECLPreStop preStop) {
-        this.preStop = preStop;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLifecycleBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecECLifecycleBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLifecycleBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLivenessProbe.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLivenessProbe.java
deleted file mode 100644
index 8304d4271fc..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECLivenessProbe.java
+++ /dev/null
@@ -1,234 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "exec",
-    "failureThreshold",
-    "grpc",
-    "httpGet",
-    "initialDelaySeconds",
-    "periodSeconds",
-    "successThreshold",
-    "tcpSocket",
-    "terminationGracePeriodSeconds",
-    "timeoutSeconds"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecECLivenessProbe implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecECLivenessProbeBuilder> , KubernetesResource
-{
-
-    @JsonProperty("exec")
-    private ClusterServiceVersionSpecISpecDSpecTSpecECLPExec exec;
-    @JsonProperty("failureThreshold")
-    private Integer failureThreshold;
-    @JsonProperty("grpc")
-    private ClusterServiceVersionSpecISpecDSpecTSpecECLPGrpc grpc;
-    @JsonProperty("httpGet")
-    private ClusterServiceVersionSpecISpecDSpecTSpecECLPHttpGet httpGet;
-    @JsonProperty("initialDelaySeconds")
-    private Integer initialDelaySeconds;
-    @JsonProperty("periodSeconds")
-    private Integer periodSeconds;
-    @JsonProperty("successThreshold")
-    private Integer successThreshold;
-    @JsonProperty("tcpSocket")
-    private ClusterServiceVersionSpecISpecDSpecTSpecECLPTcpSocket tcpSocket;
-    @JsonProperty("terminationGracePeriodSeconds")
-    private Long terminationGracePeriodSeconds;
-    @JsonProperty("timeoutSeconds")
-    private Integer timeoutSeconds;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLivenessProbe() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLivenessProbe(ClusterServiceVersionSpecISpecDSpecTSpecECLPExec exec, Integer failureThreshold, ClusterServiceVersionSpecISpecDSpecTSpecECLPGrpc grpc, ClusterServiceVersionSpecISpecDSpecTSpecECLPHttpGet httpGet, Integer initialDelaySeconds, Integer periodSeconds, Integer successThreshold, ClusterServiceVersionSpecISpecDSpecTSpecECLPTcpSocket tcpSocket, Long terminationGracePeriodSeconds, Integer timeoutSeconds) {
-        super();
-        this.exec = exec;
-        this.failureThreshold = failureThreshold;
-        this.grpc = grpc;
-        this.httpGet = httpGet;
-        this.initialDelaySeconds = initialDelaySeconds;
-        this.periodSeconds = periodSeconds;
-        this.successThreshold = successThreshold;
-        this.tcpSocket = tcpSocket;
-        this.terminationGracePeriodSeconds = terminationGracePeriodSeconds;
-        this.timeoutSeconds = timeoutSeconds;
-    }
-
-    @JsonProperty("exec")
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPExec getExec() {
-        return exec;
-    }
-
-    @JsonProperty("exec")
-    public void setExec(ClusterServiceVersionSpecISpecDSpecTSpecECLPExec exec) {
-        this.exec = exec;
-    }
-
-    @JsonProperty("failureThreshold")
-    public Integer getFailureThreshold() {
-        return failureThreshold;
-    }
-
-    @JsonProperty("failureThreshold")
-    public void setFailureThreshold(Integer failureThreshold) {
-        this.failureThreshold = failureThreshold;
-    }
-
-    @JsonProperty("grpc")
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPGrpc getGrpc() {
-        return grpc;
-    }
-
-    @JsonProperty("grpc")
-    public void setGrpc(ClusterServiceVersionSpecISpecDSpecTSpecECLPGrpc grpc) {
-        this.grpc = grpc;
-    }
-
-    @JsonProperty("httpGet")
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPHttpGet getHttpGet() {
-        return httpGet;
-    }
-
-    @JsonProperty("httpGet")
-    public void setHttpGet(ClusterServiceVersionSpecISpecDSpecTSpecECLPHttpGet httpGet) {
-        this.httpGet = httpGet;
-    }
-
-    @JsonProperty("initialDelaySeconds")
-    public Integer getInitialDelaySeconds() {
-        return initialDelaySeconds;
-    }
-
-    @JsonProperty("initialDelaySeconds")
-    public void setInitialDelaySeconds(Integer initialDelaySeconds) {
-        this.initialDelaySeconds = initialDelaySeconds;
-    }
-
-    @JsonProperty("periodSeconds")
-    public Integer getPeriodSeconds() {
-        return periodSeconds;
-    }
-
-    @JsonProperty("periodSeconds")
-    public void setPeriodSeconds(Integer periodSeconds) {
-        this.periodSeconds = periodSeconds;
-    }
-
-    @JsonProperty("successThreshold")
-    public Integer getSuccessThreshold() {
-        return successThreshold;
-    }
-
-    @JsonProperty("successThreshold")
-    public void setSuccessThreshold(Integer successThreshold) {
-        this.successThreshold = successThreshold;
-    }
-
-    @JsonProperty("tcpSocket")
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLPTcpSocket getTcpSocket() {
-        return tcpSocket;
-    }
-
-    @JsonProperty("tcpSocket")
-    public void setTcpSocket(ClusterServiceVersionSpecISpecDSpecTSpecECLPTcpSocket tcpSocket) {
-        this.tcpSocket = tcpSocket;
-    }
-
-    @JsonProperty("terminationGracePeriodSeconds")
-    public Long getTerminationGracePeriodSeconds() {
-        return terminationGracePeriodSeconds;
-    }
-
-    @JsonProperty("terminationGracePeriodSeconds")
-    public void setTerminationGracePeriodSeconds(Long terminationGracePeriodSeconds) {
-        this.terminationGracePeriodSeconds = terminationGracePeriodSeconds;
-    }
-
-    @JsonProperty("timeoutSeconds")
-    public Integer getTimeoutSeconds() {
-        return timeoutSeconds;
-    }
-
-    @JsonProperty("timeoutSeconds")
-    public void setTimeoutSeconds(Integer timeoutSeconds) {
-        this.timeoutSeconds = timeoutSeconds;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLivenessProbeBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecECLivenessProbeBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLivenessProbeBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECPorts.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECPorts.java
deleted file mode 100644
index 89042a9c0cd..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECPorts.java
+++ /dev/null
@@ -1,164 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "containerPort",
-    "hostIP",
-    "hostPort",
-    "name",
-    "protocol"
-})
-@ToString
-@EqualsAndHashCode
-@Accessors(prefix = {
-    "_",
-    ""
-})
-@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
-    @BuildableReference(ObjectMeta.class),
-    @BuildableReference(LabelSelector.class),
-    @BuildableReference(Container.class),
-    @BuildableReference(PodTemplateSpec.class),
-    @BuildableReference(ResourceRequirements.class),
-    @BuildableReference(IntOrString.class),
-    @BuildableReference(ObjectReference.class),
-    @BuildableReference(LocalObjectReference.class),
-    @BuildableReference(PersistentVolumeClaim.class)
-})
-@Generated("jsonschema2pojo")
-public class ClusterServiceVersionSpecISpecDSpecTSpecECPorts implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecECPortsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("containerPort")
-    private Integer containerPort;
-    @JsonProperty("hostIP")
-    private String hostIP;
-    @JsonProperty("hostPort")
-    private Integer hostPort;
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("protocol")
-    private String protocol;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecECPorts() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecECPorts(Integer containerPort, String hostIP, Integer hostPort, String name, String protocol) {
-        super();
-        this.containerPort = containerPort;
-        this.hostIP = hostIP;
-        this.hostPort = hostPort;
-        this.name = name;
-        this.protocol = protocol;
-    }
-
-    @JsonProperty("containerPort")
-    public Integer getContainerPort() {
-        return containerPort;
-    }
-
-    @JsonProperty("containerPort")
-    public void setContainerPort(Integer containerPort) {
-        this.containerPort = containerPort;
-    }
-
-    @JsonProperty("hostIP")
-    public String getHostIP() {
-        return hostIP;
-    }
-
-    @JsonProperty("hostIP")
-    public void setHostIP(String hostIP) {
-        this.hostIP = hostIP;
-    }
-
-    @JsonProperty("hostPort")
-    public Integer getHostPort() {
-        return hostPort;
-    }
-
-    @JsonProperty("hostPort")
-    public void setHostPort(Integer hostPort) {
-        this.hostPort = hostPort;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("protocol")
-    public String getProtocol() {
-        return protocol;
-    }
-
-    @JsonProperty("protocol")
-    public void setProtocol(String protocol) {
-        this.protocol = protocol;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECPortsBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecECPortsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECPortsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECRClaims.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECRClaims.java
deleted file mode 100644
index ec21b3e929d..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECRClaims.java
+++ /dev/null
@@ -1,108 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecECRClaims implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecECRClaimsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecECRClaims() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecECRClaims(String name) {
-        super();
-        this.name = name;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECRClaimsBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecECRClaimsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECRClaimsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECRPExec.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECRPExec.java
deleted file mode 100644
index b248b4a9f01..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECRPExec.java
+++ /dev/null
@@ -1,112 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "command"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecECRPExec implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecECRPExecBuilder> , KubernetesResource
-{
-
-    @JsonProperty("command")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> command = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecECRPExec() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecECRPExec(List<String> command) {
-        super();
-        this.command = command;
-    }
-
-    @JsonProperty("command")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getCommand() {
-        return command;
-    }
-
-    @JsonProperty("command")
-    public void setCommand(List<String> command) {
-        this.command = command;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECRPExecBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecECRPExecBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECRPExecBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECRPGrpc.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECRPGrpc.java
deleted file mode 100644
index f619fd7053e..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECRPGrpc.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "port",
-    "service"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecECRPGrpc implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecECRPGrpcBuilder> , KubernetesResource
-{
-
-    @JsonProperty("port")
-    private Integer port;
-    @JsonProperty("service")
-    private String service;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecECRPGrpc() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecECRPGrpc(Integer port, String service) {
-        super();
-        this.port = port;
-        this.service = service;
-    }
-
-    @JsonProperty("port")
-    public Integer getPort() {
-        return port;
-    }
-
-    @JsonProperty("port")
-    public void setPort(Integer port) {
-        this.port = port;
-    }
-
-    @JsonProperty("service")
-    public String getService() {
-        return service;
-    }
-
-    @JsonProperty("service")
-    public void setService(String service) {
-        this.service = service;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECRPGrpcBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecECRPGrpcBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECRPGrpcBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECRPHGHttpHeaders.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECRPHGHttpHeaders.java
deleted file mode 100644
index c4f1f3e5de6..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECRPHGHttpHeaders.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name",
-    "value"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecECRPHGHttpHeaders implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecECRPHGHttpHeadersBuilder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("value")
-    private String value;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecECRPHGHttpHeaders() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecECRPHGHttpHeaders(String name, String value) {
-        super();
-        this.name = name;
-        this.value = value;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("value")
-    public String getValue() {
-        return value;
-    }
-
-    @JsonProperty("value")
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECRPHGHttpHeadersBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecECRPHGHttpHeadersBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECRPHGHttpHeadersBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECRPHttpGet.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECRPHttpGet.java
deleted file mode 100644
index ccc40d93380..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECRPHttpGet.java
+++ /dev/null
@@ -1,170 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "host",
-    "httpHeaders",
-    "path",
-    "port",
-    "scheme"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecECRPHttpGet implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecECRPHttpGetBuilder> , KubernetesResource
-{
-
-    @JsonProperty("host")
-    private String host;
-    @JsonProperty("httpHeaders")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecECRPHGHttpHeaders> httpHeaders = new ArrayList<>();
-    @JsonProperty("path")
-    private String path;
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object port;
-    @JsonProperty("scheme")
-    private String scheme;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecECRPHttpGet() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecECRPHttpGet(String host, List<ClusterServiceVersionSpecISpecDSpecTSpecECRPHGHttpHeaders> httpHeaders, String path, Object port, String scheme) {
-        super();
-        this.host = host;
-        this.httpHeaders = httpHeaders;
-        this.path = path;
-        this.port = port;
-        this.scheme = scheme;
-    }
-
-    @JsonProperty("host")
-    public String getHost() {
-        return host;
-    }
-
-    @JsonProperty("host")
-    public void setHost(String host) {
-        this.host = host;
-    }
-
-    @JsonProperty("httpHeaders")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecECRPHGHttpHeaders> getHttpHeaders() {
-        return httpHeaders;
-    }
-
-    @JsonProperty("httpHeaders")
-    public void setHttpHeaders(List<ClusterServiceVersionSpecISpecDSpecTSpecECRPHGHttpHeaders> httpHeaders) {
-        this.httpHeaders = httpHeaders;
-    }
-
-    @JsonProperty("path")
-    public String getPath() {
-        return path;
-    }
-
-    @JsonProperty("path")
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @JsonProperty("port")
-    public Object getPort() {
-        return port;
-    }
-
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setPort(Object port) {
-        this.port = port;
-    }
-
-    @JsonProperty("scheme")
-    public String getScheme() {
-        return scheme;
-    }
-
-    @JsonProperty("scheme")
-    public void setScheme(String scheme) {
-        this.scheme = scheme;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECRPHttpGetBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecECRPHttpGetBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECRPHttpGetBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECRPTcpSocket.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECRPTcpSocket.java
deleted file mode 100644
index 8ddd9c43c85..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECRPTcpSocket.java
+++ /dev/null
@@ -1,124 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "host",
-    "port"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecECRPTcpSocket implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecECRPTcpSocketBuilder> , KubernetesResource
-{
-
-    @JsonProperty("host")
-    private String host;
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object port;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecECRPTcpSocket() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecECRPTcpSocket(String host, Object port) {
-        super();
-        this.host = host;
-        this.port = port;
-    }
-
-    @JsonProperty("host")
-    public String getHost() {
-        return host;
-    }
-
-    @JsonProperty("host")
-    public void setHost(String host) {
-        this.host = host;
-    }
-
-    @JsonProperty("port")
-    public Object getPort() {
-        return port;
-    }
-
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setPort(Object port) {
-        this.port = port;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECRPTcpSocketBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecECRPTcpSocketBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECRPTcpSocketBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECReadinessProbe.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECReadinessProbe.java
deleted file mode 100644
index 0b907be3866..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECReadinessProbe.java
+++ /dev/null
@@ -1,234 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "exec",
-    "failureThreshold",
-    "grpc",
-    "httpGet",
-    "initialDelaySeconds",
-    "periodSeconds",
-    "successThreshold",
-    "tcpSocket",
-    "terminationGracePeriodSeconds",
-    "timeoutSeconds"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecECReadinessProbe implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecECReadinessProbeBuilder> , KubernetesResource
-{
-
-    @JsonProperty("exec")
-    private ClusterServiceVersionSpecISpecDSpecTSpecECRPExec exec;
-    @JsonProperty("failureThreshold")
-    private Integer failureThreshold;
-    @JsonProperty("grpc")
-    private ClusterServiceVersionSpecISpecDSpecTSpecECRPGrpc grpc;
-    @JsonProperty("httpGet")
-    private ClusterServiceVersionSpecISpecDSpecTSpecECRPHttpGet httpGet;
-    @JsonProperty("initialDelaySeconds")
-    private Integer initialDelaySeconds;
-    @JsonProperty("periodSeconds")
-    private Integer periodSeconds;
-    @JsonProperty("successThreshold")
-    private Integer successThreshold;
-    @JsonProperty("tcpSocket")
-    private ClusterServiceVersionSpecISpecDSpecTSpecECRPTcpSocket tcpSocket;
-    @JsonProperty("terminationGracePeriodSeconds")
-    private Long terminationGracePeriodSeconds;
-    @JsonProperty("timeoutSeconds")
-    private Integer timeoutSeconds;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecECReadinessProbe() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecECReadinessProbe(ClusterServiceVersionSpecISpecDSpecTSpecECRPExec exec, Integer failureThreshold, ClusterServiceVersionSpecISpecDSpecTSpecECRPGrpc grpc, ClusterServiceVersionSpecISpecDSpecTSpecECRPHttpGet httpGet, Integer initialDelaySeconds, Integer periodSeconds, Integer successThreshold, ClusterServiceVersionSpecISpecDSpecTSpecECRPTcpSocket tcpSocket, Long terminationGracePeriodSeconds, Integer timeoutSeconds) {
-        super();
-        this.exec = exec;
-        this.failureThreshold = failureThreshold;
-        this.grpc = grpc;
-        this.httpGet = httpGet;
-        this.initialDelaySeconds = initialDelaySeconds;
-        this.periodSeconds = periodSeconds;
-        this.successThreshold = successThreshold;
-        this.tcpSocket = tcpSocket;
-        this.terminationGracePeriodSeconds = terminationGracePeriodSeconds;
-        this.timeoutSeconds = timeoutSeconds;
-    }
-
-    @JsonProperty("exec")
-    public ClusterServiceVersionSpecISpecDSpecTSpecECRPExec getExec() {
-        return exec;
-    }
-
-    @JsonProperty("exec")
-    public void setExec(ClusterServiceVersionSpecISpecDSpecTSpecECRPExec exec) {
-        this.exec = exec;
-    }
-
-    @JsonProperty("failureThreshold")
-    public Integer getFailureThreshold() {
-        return failureThreshold;
-    }
-
-    @JsonProperty("failureThreshold")
-    public void setFailureThreshold(Integer failureThreshold) {
-        this.failureThreshold = failureThreshold;
-    }
-
-    @JsonProperty("grpc")
-    public ClusterServiceVersionSpecISpecDSpecTSpecECRPGrpc getGrpc() {
-        return grpc;
-    }
-
-    @JsonProperty("grpc")
-    public void setGrpc(ClusterServiceVersionSpecISpecDSpecTSpecECRPGrpc grpc) {
-        this.grpc = grpc;
-    }
-
-    @JsonProperty("httpGet")
-    public ClusterServiceVersionSpecISpecDSpecTSpecECRPHttpGet getHttpGet() {
-        return httpGet;
-    }
-
-    @JsonProperty("httpGet")
-    public void setHttpGet(ClusterServiceVersionSpecISpecDSpecTSpecECRPHttpGet httpGet) {
-        this.httpGet = httpGet;
-    }
-
-    @JsonProperty("initialDelaySeconds")
-    public Integer getInitialDelaySeconds() {
-        return initialDelaySeconds;
-    }
-
-    @JsonProperty("initialDelaySeconds")
-    public void setInitialDelaySeconds(Integer initialDelaySeconds) {
-        this.initialDelaySeconds = initialDelaySeconds;
-    }
-
-    @JsonProperty("periodSeconds")
-    public Integer getPeriodSeconds() {
-        return periodSeconds;
-    }
-
-    @JsonProperty("periodSeconds")
-    public void setPeriodSeconds(Integer periodSeconds) {
-        this.periodSeconds = periodSeconds;
-    }
-
-    @JsonProperty("successThreshold")
-    public Integer getSuccessThreshold() {
-        return successThreshold;
-    }
-
-    @JsonProperty("successThreshold")
-    public void setSuccessThreshold(Integer successThreshold) {
-        this.successThreshold = successThreshold;
-    }
-
-    @JsonProperty("tcpSocket")
-    public ClusterServiceVersionSpecISpecDSpecTSpecECRPTcpSocket getTcpSocket() {
-        return tcpSocket;
-    }
-
-    @JsonProperty("tcpSocket")
-    public void setTcpSocket(ClusterServiceVersionSpecISpecDSpecTSpecECRPTcpSocket tcpSocket) {
-        this.tcpSocket = tcpSocket;
-    }
-
-    @JsonProperty("terminationGracePeriodSeconds")
-    public Long getTerminationGracePeriodSeconds() {
-        return terminationGracePeriodSeconds;
-    }
-
-    @JsonProperty("terminationGracePeriodSeconds")
-    public void setTerminationGracePeriodSeconds(Long terminationGracePeriodSeconds) {
-        this.terminationGracePeriodSeconds = terminationGracePeriodSeconds;
-    }
-
-    @JsonProperty("timeoutSeconds")
-    public Integer getTimeoutSeconds() {
-        return timeoutSeconds;
-    }
-
-    @JsonProperty("timeoutSeconds")
-    public void setTimeoutSeconds(Integer timeoutSeconds) {
-        this.timeoutSeconds = timeoutSeconds;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECReadinessProbeBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecECReadinessProbeBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECReadinessProbeBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECResizePolicy.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECResizePolicy.java
deleted file mode 100644
index 9519668ad1e..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECResizePolicy.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "resourceName",
-    "restartPolicy"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecECResizePolicy implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecECResizePolicyBuilder> , KubernetesResource
-{
-
-    @JsonProperty("resourceName")
-    private String resourceName;
-    @JsonProperty("restartPolicy")
-    private String restartPolicy;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecECResizePolicy() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecECResizePolicy(String resourceName, String restartPolicy) {
-        super();
-        this.resourceName = resourceName;
-        this.restartPolicy = restartPolicy;
-    }
-
-    @JsonProperty("resourceName")
-    public String getResourceName() {
-        return resourceName;
-    }
-
-    @JsonProperty("resourceName")
-    public void setResourceName(String resourceName) {
-        this.resourceName = resourceName;
-    }
-
-    @JsonProperty("restartPolicy")
-    public String getRestartPolicy() {
-        return restartPolicy;
-    }
-
-    @JsonProperty("restartPolicy")
-    public void setRestartPolicy(String restartPolicy) {
-        this.restartPolicy = restartPolicy;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECResizePolicyBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecECResizePolicyBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECResizePolicyBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECResources.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECResources.java
deleted file mode 100644
index ff9348c2eaf..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECResources.java
+++ /dev/null
@@ -1,148 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "claims",
-    "limits",
-    "requests"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecECResources implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecECResourcesBuilder> , KubernetesResource
-{
-
-    @JsonProperty("claims")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecECRClaims> claims = new ArrayList<>();
-    @JsonProperty("limits")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializerForMap.class)
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, Object> limits = new LinkedHashMap<>();
-    @JsonProperty("requests")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializerForMap.class)
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, Object> requests = new LinkedHashMap<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecECResources() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecECResources(List<ClusterServiceVersionSpecISpecDSpecTSpecECRClaims> claims, Map<String, Object> limits, Map<String, Object> requests) {
-        super();
-        this.claims = claims;
-        this.limits = limits;
-        this.requests = requests;
-    }
-
-    @JsonProperty("claims")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecECRClaims> getClaims() {
-        return claims;
-    }
-
-    @JsonProperty("claims")
-    public void setClaims(List<ClusterServiceVersionSpecISpecDSpecTSpecECRClaims> claims) {
-        this.claims = claims;
-    }
-
-    @JsonProperty("limits")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, Object> getLimits() {
-        return limits;
-    }
-
-    @JsonProperty("limits")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializerForMap.class)
-    public void setLimits(Map<String, Object> limits) {
-        this.limits = limits;
-    }
-
-    @JsonProperty("requests")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, Object> getRequests() {
-        return requests;
-    }
-
-    @JsonProperty("requests")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializerForMap.class)
-    public void setRequests(Map<String, Object> requests) {
-        this.requests = requests;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECResourcesBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecECResourcesBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECResourcesBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECSCAppArmorProfile.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECSCAppArmorProfile.java
deleted file mode 100644
index 1930886f4a7..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECSCAppArmorProfile.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "localhostProfile",
-    "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 ClusterServiceVersionSpecISpecDSpecTSpecECSCAppArmorProfile implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecECSCAppArmorProfileBuilder> , KubernetesResource
-{
-
-    @JsonProperty("localhostProfile")
-    private String localhostProfile;
-    @JsonProperty("type")
-    private String type;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSCAppArmorProfile() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSCAppArmorProfile(String localhostProfile, String type) {
-        super();
-        this.localhostProfile = localhostProfile;
-        this.type = type;
-    }
-
-    @JsonProperty("localhostProfile")
-    public String getLocalhostProfile() {
-        return localhostProfile;
-    }
-
-    @JsonProperty("localhostProfile")
-    public void setLocalhostProfile(String localhostProfile) {
-        this.localhostProfile = localhostProfile;
-    }
-
-    @JsonProperty("type")
-    public String getType() {
-        return type;
-    }
-
-    @JsonProperty("type")
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSCAppArmorProfileBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecECSCAppArmorProfileBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSCAppArmorProfileBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECSCCapabilities.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECSCCapabilities.java
deleted file mode 100644
index 76d223cb190..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECSCCapabilities.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "add",
-    "drop"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecECSCCapabilities implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecECSCCapabilitiesBuilder> , KubernetesResource
-{
-
-    @JsonProperty("add")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> add = new ArrayList<>();
-    @JsonProperty("drop")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> drop = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSCCapabilities() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSCCapabilities(List<String> add, List<String> drop) {
-        super();
-        this.add = add;
-        this.drop = drop;
-    }
-
-    @JsonProperty("add")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getAdd() {
-        return add;
-    }
-
-    @JsonProperty("add")
-    public void setAdd(List<String> add) {
-        this.add = add;
-    }
-
-    @JsonProperty("drop")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getDrop() {
-        return drop;
-    }
-
-    @JsonProperty("drop")
-    public void setDrop(List<String> drop) {
-        this.drop = drop;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSCCapabilitiesBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecECSCCapabilitiesBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSCCapabilitiesBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECSCSeLinuxOptions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECSCSeLinuxOptions.java
deleted file mode 100644
index 4529cde1d93..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECSCSeLinuxOptions.java
+++ /dev/null
@@ -1,150 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "level",
-    "role",
-    "type",
-    "user"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecECSCSeLinuxOptions implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecECSCSeLinuxOptionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("level")
-    private String level;
-    @JsonProperty("role")
-    private String role;
-    @JsonProperty("type")
-    private String type;
-    @JsonProperty("user")
-    private String user;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSCSeLinuxOptions() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSCSeLinuxOptions(String level, String role, String type, String user) {
-        super();
-        this.level = level;
-        this.role = role;
-        this.type = type;
-        this.user = user;
-    }
-
-    @JsonProperty("level")
-    public String getLevel() {
-        return level;
-    }
-
-    @JsonProperty("level")
-    public void setLevel(String level) {
-        this.level = level;
-    }
-
-    @JsonProperty("role")
-    public String getRole() {
-        return role;
-    }
-
-    @JsonProperty("role")
-    public void setRole(String role) {
-        this.role = role;
-    }
-
-    @JsonProperty("type")
-    public String getType() {
-        return type;
-    }
-
-    @JsonProperty("type")
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    @JsonProperty("user")
-    public String getUser() {
-        return user;
-    }
-
-    @JsonProperty("user")
-    public void setUser(String user) {
-        this.user = user;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSCSeLinuxOptionsBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecECSCSeLinuxOptionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSCSeLinuxOptionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECSCSeccompProfile.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECSCSeccompProfile.java
deleted file mode 100644
index 7c438e6262b..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECSCSeccompProfile.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "localhostProfile",
-    "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 ClusterServiceVersionSpecISpecDSpecTSpecECSCSeccompProfile implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecECSCSeccompProfileBuilder> , KubernetesResource
-{
-
-    @JsonProperty("localhostProfile")
-    private String localhostProfile;
-    @JsonProperty("type")
-    private String type;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSCSeccompProfile() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSCSeccompProfile(String localhostProfile, String type) {
-        super();
-        this.localhostProfile = localhostProfile;
-        this.type = type;
-    }
-
-    @JsonProperty("localhostProfile")
-    public String getLocalhostProfile() {
-        return localhostProfile;
-    }
-
-    @JsonProperty("localhostProfile")
-    public void setLocalhostProfile(String localhostProfile) {
-        this.localhostProfile = localhostProfile;
-    }
-
-    @JsonProperty("type")
-    public String getType() {
-        return type;
-    }
-
-    @JsonProperty("type")
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSCSeccompProfileBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecECSCSeccompProfileBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSCSeccompProfileBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECSCWindowsOptions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECSCWindowsOptions.java
deleted file mode 100644
index c1c301808b0..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECSCWindowsOptions.java
+++ /dev/null
@@ -1,150 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "gmsaCredentialSpec",
-    "gmsaCredentialSpecName",
-    "hostProcess",
-    "runAsUserName"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecECSCWindowsOptions implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecECSCWindowsOptionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("gmsaCredentialSpec")
-    private String gmsaCredentialSpec;
-    @JsonProperty("gmsaCredentialSpecName")
-    private String gmsaCredentialSpecName;
-    @JsonProperty("hostProcess")
-    private Boolean hostProcess;
-    @JsonProperty("runAsUserName")
-    private String runAsUserName;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSCWindowsOptions() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSCWindowsOptions(String gmsaCredentialSpec, String gmsaCredentialSpecName, Boolean hostProcess, String runAsUserName) {
-        super();
-        this.gmsaCredentialSpec = gmsaCredentialSpec;
-        this.gmsaCredentialSpecName = gmsaCredentialSpecName;
-        this.hostProcess = hostProcess;
-        this.runAsUserName = runAsUserName;
-    }
-
-    @JsonProperty("gmsaCredentialSpec")
-    public String getGmsaCredentialSpec() {
-        return gmsaCredentialSpec;
-    }
-
-    @JsonProperty("gmsaCredentialSpec")
-    public void setGmsaCredentialSpec(String gmsaCredentialSpec) {
-        this.gmsaCredentialSpec = gmsaCredentialSpec;
-    }
-
-    @JsonProperty("gmsaCredentialSpecName")
-    public String getGmsaCredentialSpecName() {
-        return gmsaCredentialSpecName;
-    }
-
-    @JsonProperty("gmsaCredentialSpecName")
-    public void setGmsaCredentialSpecName(String gmsaCredentialSpecName) {
-        this.gmsaCredentialSpecName = gmsaCredentialSpecName;
-    }
-
-    @JsonProperty("hostProcess")
-    public Boolean getHostProcess() {
-        return hostProcess;
-    }
-
-    @JsonProperty("hostProcess")
-    public void setHostProcess(Boolean hostProcess) {
-        this.hostProcess = hostProcess;
-    }
-
-    @JsonProperty("runAsUserName")
-    public String getRunAsUserName() {
-        return runAsUserName;
-    }
-
-    @JsonProperty("runAsUserName")
-    public void setRunAsUserName(String runAsUserName) {
-        this.runAsUserName = runAsUserName;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSCWindowsOptionsBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecECSCWindowsOptionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSCWindowsOptionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECSPExec.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECSPExec.java
deleted file mode 100644
index 8e6a8e27a81..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECSPExec.java
+++ /dev/null
@@ -1,112 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "command"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecECSPExec implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecECSPExecBuilder> , KubernetesResource
-{
-
-    @JsonProperty("command")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> command = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSPExec() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSPExec(List<String> command) {
-        super();
-        this.command = command;
-    }
-
-    @JsonProperty("command")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getCommand() {
-        return command;
-    }
-
-    @JsonProperty("command")
-    public void setCommand(List<String> command) {
-        this.command = command;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSPExecBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecECSPExecBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSPExecBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECSPGrpc.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECSPGrpc.java
deleted file mode 100644
index c77393a9012..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECSPGrpc.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "port",
-    "service"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecECSPGrpc implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecECSPGrpcBuilder> , KubernetesResource
-{
-
-    @JsonProperty("port")
-    private Integer port;
-    @JsonProperty("service")
-    private String service;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSPGrpc() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSPGrpc(Integer port, String service) {
-        super();
-        this.port = port;
-        this.service = service;
-    }
-
-    @JsonProperty("port")
-    public Integer getPort() {
-        return port;
-    }
-
-    @JsonProperty("port")
-    public void setPort(Integer port) {
-        this.port = port;
-    }
-
-    @JsonProperty("service")
-    public String getService() {
-        return service;
-    }
-
-    @JsonProperty("service")
-    public void setService(String service) {
-        this.service = service;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSPGrpcBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecECSPGrpcBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSPGrpcBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECSPHGHttpHeaders.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECSPHGHttpHeaders.java
deleted file mode 100644
index 9558c4b91d9..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECSPHGHttpHeaders.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name",
-    "value"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecECSPHGHttpHeaders implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecECSPHGHttpHeadersBuilder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("value")
-    private String value;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSPHGHttpHeaders() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSPHGHttpHeaders(String name, String value) {
-        super();
-        this.name = name;
-        this.value = value;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("value")
-    public String getValue() {
-        return value;
-    }
-
-    @JsonProperty("value")
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSPHGHttpHeadersBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecECSPHGHttpHeadersBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSPHGHttpHeadersBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECSPHttpGet.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECSPHttpGet.java
deleted file mode 100644
index 70eb017a77b..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECSPHttpGet.java
+++ /dev/null
@@ -1,170 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "host",
-    "httpHeaders",
-    "path",
-    "port",
-    "scheme"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecECSPHttpGet implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecECSPHttpGetBuilder> , KubernetesResource
-{
-
-    @JsonProperty("host")
-    private String host;
-    @JsonProperty("httpHeaders")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecECSPHGHttpHeaders> httpHeaders = new ArrayList<>();
-    @JsonProperty("path")
-    private String path;
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object port;
-    @JsonProperty("scheme")
-    private String scheme;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSPHttpGet() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSPHttpGet(String host, List<ClusterServiceVersionSpecISpecDSpecTSpecECSPHGHttpHeaders> httpHeaders, String path, Object port, String scheme) {
-        super();
-        this.host = host;
-        this.httpHeaders = httpHeaders;
-        this.path = path;
-        this.port = port;
-        this.scheme = scheme;
-    }
-
-    @JsonProperty("host")
-    public String getHost() {
-        return host;
-    }
-
-    @JsonProperty("host")
-    public void setHost(String host) {
-        this.host = host;
-    }
-
-    @JsonProperty("httpHeaders")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecECSPHGHttpHeaders> getHttpHeaders() {
-        return httpHeaders;
-    }
-
-    @JsonProperty("httpHeaders")
-    public void setHttpHeaders(List<ClusterServiceVersionSpecISpecDSpecTSpecECSPHGHttpHeaders> httpHeaders) {
-        this.httpHeaders = httpHeaders;
-    }
-
-    @JsonProperty("path")
-    public String getPath() {
-        return path;
-    }
-
-    @JsonProperty("path")
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @JsonProperty("port")
-    public Object getPort() {
-        return port;
-    }
-
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setPort(Object port) {
-        this.port = port;
-    }
-
-    @JsonProperty("scheme")
-    public String getScheme() {
-        return scheme;
-    }
-
-    @JsonProperty("scheme")
-    public void setScheme(String scheme) {
-        this.scheme = scheme;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSPHttpGetBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecECSPHttpGetBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSPHttpGetBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECSPTcpSocket.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECSPTcpSocket.java
deleted file mode 100644
index 4d65d2472fb..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECSPTcpSocket.java
+++ /dev/null
@@ -1,124 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "host",
-    "port"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecECSPTcpSocket implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecECSPTcpSocketBuilder> , KubernetesResource
-{
-
-    @JsonProperty("host")
-    private String host;
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object port;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSPTcpSocket() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSPTcpSocket(String host, Object port) {
-        super();
-        this.host = host;
-        this.port = port;
-    }
-
-    @JsonProperty("host")
-    public String getHost() {
-        return host;
-    }
-
-    @JsonProperty("host")
-    public void setHost(String host) {
-        this.host = host;
-    }
-
-    @JsonProperty("port")
-    public Object getPort() {
-        return port;
-    }
-
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setPort(Object port) {
-        this.port = port;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSPTcpSocketBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecECSPTcpSocketBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSPTcpSocketBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECSecurityContext.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECSecurityContext.java
deleted file mode 100644
index 0c5f02e482b..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECSecurityContext.java
+++ /dev/null
@@ -1,262 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "allowPrivilegeEscalation",
-    "appArmorProfile",
-    "capabilities",
-    "privileged",
-    "procMount",
-    "readOnlyRootFilesystem",
-    "runAsGroup",
-    "runAsNonRoot",
-    "runAsUser",
-    "seLinuxOptions",
-    "seccompProfile",
-    "windowsOptions"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecECSecurityContext implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecECSecurityContextBuilder> , KubernetesResource
-{
-
-    @JsonProperty("allowPrivilegeEscalation")
-    private Boolean allowPrivilegeEscalation;
-    @JsonProperty("appArmorProfile")
-    private ClusterServiceVersionSpecISpecDSpecTSpecECSCAppArmorProfile appArmorProfile;
-    @JsonProperty("capabilities")
-    private ClusterServiceVersionSpecISpecDSpecTSpecECSCCapabilities capabilities;
-    @JsonProperty("privileged")
-    private Boolean privileged;
-    @JsonProperty("procMount")
-    private String procMount;
-    @JsonProperty("readOnlyRootFilesystem")
-    private Boolean readOnlyRootFilesystem;
-    @JsonProperty("runAsGroup")
-    private Long runAsGroup;
-    @JsonProperty("runAsNonRoot")
-    private Boolean runAsNonRoot;
-    @JsonProperty("runAsUser")
-    private Long runAsUser;
-    @JsonProperty("seLinuxOptions")
-    private ClusterServiceVersionSpecISpecDSpecTSpecECSCSeLinuxOptions seLinuxOptions;
-    @JsonProperty("seccompProfile")
-    private ClusterServiceVersionSpecISpecDSpecTSpecECSCSeccompProfile seccompProfile;
-    @JsonProperty("windowsOptions")
-    private ClusterServiceVersionSpecISpecDSpecTSpecECSCWindowsOptions windowsOptions;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSecurityContext() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSecurityContext(Boolean allowPrivilegeEscalation, ClusterServiceVersionSpecISpecDSpecTSpecECSCAppArmorProfile appArmorProfile, ClusterServiceVersionSpecISpecDSpecTSpecECSCCapabilities capabilities, Boolean privileged, String procMount, Boolean readOnlyRootFilesystem, Long runAsGroup, Boolean runAsNonRoot, Long runAsUser, ClusterServiceVersionSpecISpecDSpecTSpecECSCSeLinuxOptions seLinuxOptions, ClusterServiceVersionSpecISpecDSpecTSpecECSCSeccompProfile seccompProfile, ClusterServiceVersionSpecISpecDSpecTSpecECSCWindowsOptions windowsOptions) {
-        super();
-        this.allowPrivilegeEscalation = allowPrivilegeEscalation;
-        this.appArmorProfile = appArmorProfile;
-        this.capabilities = capabilities;
-        this.privileged = privileged;
-        this.procMount = procMount;
-        this.readOnlyRootFilesystem = readOnlyRootFilesystem;
-        this.runAsGroup = runAsGroup;
-        this.runAsNonRoot = runAsNonRoot;
-        this.runAsUser = runAsUser;
-        this.seLinuxOptions = seLinuxOptions;
-        this.seccompProfile = seccompProfile;
-        this.windowsOptions = windowsOptions;
-    }
-
-    @JsonProperty("allowPrivilegeEscalation")
-    public Boolean getAllowPrivilegeEscalation() {
-        return allowPrivilegeEscalation;
-    }
-
-    @JsonProperty("allowPrivilegeEscalation")
-    public void setAllowPrivilegeEscalation(Boolean allowPrivilegeEscalation) {
-        this.allowPrivilegeEscalation = allowPrivilegeEscalation;
-    }
-
-    @JsonProperty("appArmorProfile")
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSCAppArmorProfile getAppArmorProfile() {
-        return appArmorProfile;
-    }
-
-    @JsonProperty("appArmorProfile")
-    public void setAppArmorProfile(ClusterServiceVersionSpecISpecDSpecTSpecECSCAppArmorProfile appArmorProfile) {
-        this.appArmorProfile = appArmorProfile;
-    }
-
-    @JsonProperty("capabilities")
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSCCapabilities getCapabilities() {
-        return capabilities;
-    }
-
-    @JsonProperty("capabilities")
-    public void setCapabilities(ClusterServiceVersionSpecISpecDSpecTSpecECSCCapabilities capabilities) {
-        this.capabilities = capabilities;
-    }
-
-    @JsonProperty("privileged")
-    public Boolean getPrivileged() {
-        return privileged;
-    }
-
-    @JsonProperty("privileged")
-    public void setPrivileged(Boolean privileged) {
-        this.privileged = privileged;
-    }
-
-    @JsonProperty("procMount")
-    public String getProcMount() {
-        return procMount;
-    }
-
-    @JsonProperty("procMount")
-    public void setProcMount(String procMount) {
-        this.procMount = procMount;
-    }
-
-    @JsonProperty("readOnlyRootFilesystem")
-    public Boolean getReadOnlyRootFilesystem() {
-        return readOnlyRootFilesystem;
-    }
-
-    @JsonProperty("readOnlyRootFilesystem")
-    public void setReadOnlyRootFilesystem(Boolean readOnlyRootFilesystem) {
-        this.readOnlyRootFilesystem = readOnlyRootFilesystem;
-    }
-
-    @JsonProperty("runAsGroup")
-    public Long getRunAsGroup() {
-        return runAsGroup;
-    }
-
-    @JsonProperty("runAsGroup")
-    public void setRunAsGroup(Long runAsGroup) {
-        this.runAsGroup = runAsGroup;
-    }
-
-    @JsonProperty("runAsNonRoot")
-    public Boolean getRunAsNonRoot() {
-        return runAsNonRoot;
-    }
-
-    @JsonProperty("runAsNonRoot")
-    public void setRunAsNonRoot(Boolean runAsNonRoot) {
-        this.runAsNonRoot = runAsNonRoot;
-    }
-
-    @JsonProperty("runAsUser")
-    public Long getRunAsUser() {
-        return runAsUser;
-    }
-
-    @JsonProperty("runAsUser")
-    public void setRunAsUser(Long runAsUser) {
-        this.runAsUser = runAsUser;
-    }
-
-    @JsonProperty("seLinuxOptions")
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSCSeLinuxOptions getSeLinuxOptions() {
-        return seLinuxOptions;
-    }
-
-    @JsonProperty("seLinuxOptions")
-    public void setSeLinuxOptions(ClusterServiceVersionSpecISpecDSpecTSpecECSCSeLinuxOptions seLinuxOptions) {
-        this.seLinuxOptions = seLinuxOptions;
-    }
-
-    @JsonProperty("seccompProfile")
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSCSeccompProfile getSeccompProfile() {
-        return seccompProfile;
-    }
-
-    @JsonProperty("seccompProfile")
-    public void setSeccompProfile(ClusterServiceVersionSpecISpecDSpecTSpecECSCSeccompProfile seccompProfile) {
-        this.seccompProfile = seccompProfile;
-    }
-
-    @JsonProperty("windowsOptions")
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSCWindowsOptions getWindowsOptions() {
-        return windowsOptions;
-    }
-
-    @JsonProperty("windowsOptions")
-    public void setWindowsOptions(ClusterServiceVersionSpecISpecDSpecTSpecECSCWindowsOptions windowsOptions) {
-        this.windowsOptions = windowsOptions;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSecurityContextBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecECSecurityContextBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSecurityContextBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECStartupProbe.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECStartupProbe.java
deleted file mode 100644
index 36233bfc62b..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECStartupProbe.java
+++ /dev/null
@@ -1,234 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "exec",
-    "failureThreshold",
-    "grpc",
-    "httpGet",
-    "initialDelaySeconds",
-    "periodSeconds",
-    "successThreshold",
-    "tcpSocket",
-    "terminationGracePeriodSeconds",
-    "timeoutSeconds"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecECStartupProbe implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecECStartupProbeBuilder> , KubernetesResource
-{
-
-    @JsonProperty("exec")
-    private ClusterServiceVersionSpecISpecDSpecTSpecECSPExec exec;
-    @JsonProperty("failureThreshold")
-    private Integer failureThreshold;
-    @JsonProperty("grpc")
-    private ClusterServiceVersionSpecISpecDSpecTSpecECSPGrpc grpc;
-    @JsonProperty("httpGet")
-    private ClusterServiceVersionSpecISpecDSpecTSpecECSPHttpGet httpGet;
-    @JsonProperty("initialDelaySeconds")
-    private Integer initialDelaySeconds;
-    @JsonProperty("periodSeconds")
-    private Integer periodSeconds;
-    @JsonProperty("successThreshold")
-    private Integer successThreshold;
-    @JsonProperty("tcpSocket")
-    private ClusterServiceVersionSpecISpecDSpecTSpecECSPTcpSocket tcpSocket;
-    @JsonProperty("terminationGracePeriodSeconds")
-    private Long terminationGracePeriodSeconds;
-    @JsonProperty("timeoutSeconds")
-    private Integer timeoutSeconds;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecECStartupProbe() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecECStartupProbe(ClusterServiceVersionSpecISpecDSpecTSpecECSPExec exec, Integer failureThreshold, ClusterServiceVersionSpecISpecDSpecTSpecECSPGrpc grpc, ClusterServiceVersionSpecISpecDSpecTSpecECSPHttpGet httpGet, Integer initialDelaySeconds, Integer periodSeconds, Integer successThreshold, ClusterServiceVersionSpecISpecDSpecTSpecECSPTcpSocket tcpSocket, Long terminationGracePeriodSeconds, Integer timeoutSeconds) {
-        super();
-        this.exec = exec;
-        this.failureThreshold = failureThreshold;
-        this.grpc = grpc;
-        this.httpGet = httpGet;
-        this.initialDelaySeconds = initialDelaySeconds;
-        this.periodSeconds = periodSeconds;
-        this.successThreshold = successThreshold;
-        this.tcpSocket = tcpSocket;
-        this.terminationGracePeriodSeconds = terminationGracePeriodSeconds;
-        this.timeoutSeconds = timeoutSeconds;
-    }
-
-    @JsonProperty("exec")
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSPExec getExec() {
-        return exec;
-    }
-
-    @JsonProperty("exec")
-    public void setExec(ClusterServiceVersionSpecISpecDSpecTSpecECSPExec exec) {
-        this.exec = exec;
-    }
-
-    @JsonProperty("failureThreshold")
-    public Integer getFailureThreshold() {
-        return failureThreshold;
-    }
-
-    @JsonProperty("failureThreshold")
-    public void setFailureThreshold(Integer failureThreshold) {
-        this.failureThreshold = failureThreshold;
-    }
-
-    @JsonProperty("grpc")
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSPGrpc getGrpc() {
-        return grpc;
-    }
-
-    @JsonProperty("grpc")
-    public void setGrpc(ClusterServiceVersionSpecISpecDSpecTSpecECSPGrpc grpc) {
-        this.grpc = grpc;
-    }
-
-    @JsonProperty("httpGet")
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSPHttpGet getHttpGet() {
-        return httpGet;
-    }
-
-    @JsonProperty("httpGet")
-    public void setHttpGet(ClusterServiceVersionSpecISpecDSpecTSpecECSPHttpGet httpGet) {
-        this.httpGet = httpGet;
-    }
-
-    @JsonProperty("initialDelaySeconds")
-    public Integer getInitialDelaySeconds() {
-        return initialDelaySeconds;
-    }
-
-    @JsonProperty("initialDelaySeconds")
-    public void setInitialDelaySeconds(Integer initialDelaySeconds) {
-        this.initialDelaySeconds = initialDelaySeconds;
-    }
-
-    @JsonProperty("periodSeconds")
-    public Integer getPeriodSeconds() {
-        return periodSeconds;
-    }
-
-    @JsonProperty("periodSeconds")
-    public void setPeriodSeconds(Integer periodSeconds) {
-        this.periodSeconds = periodSeconds;
-    }
-
-    @JsonProperty("successThreshold")
-    public Integer getSuccessThreshold() {
-        return successThreshold;
-    }
-
-    @JsonProperty("successThreshold")
-    public void setSuccessThreshold(Integer successThreshold) {
-        this.successThreshold = successThreshold;
-    }
-
-    @JsonProperty("tcpSocket")
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSPTcpSocket getTcpSocket() {
-        return tcpSocket;
-    }
-
-    @JsonProperty("tcpSocket")
-    public void setTcpSocket(ClusterServiceVersionSpecISpecDSpecTSpecECSPTcpSocket tcpSocket) {
-        this.tcpSocket = tcpSocket;
-    }
-
-    @JsonProperty("terminationGracePeriodSeconds")
-    public Long getTerminationGracePeriodSeconds() {
-        return terminationGracePeriodSeconds;
-    }
-
-    @JsonProperty("terminationGracePeriodSeconds")
-    public void setTerminationGracePeriodSeconds(Long terminationGracePeriodSeconds) {
-        this.terminationGracePeriodSeconds = terminationGracePeriodSeconds;
-    }
-
-    @JsonProperty("timeoutSeconds")
-    public Integer getTimeoutSeconds() {
-        return timeoutSeconds;
-    }
-
-    @JsonProperty("timeoutSeconds")
-    public void setTimeoutSeconds(Integer timeoutSeconds) {
-        this.timeoutSeconds = timeoutSeconds;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECStartupProbeBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecECStartupProbeBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECStartupProbeBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECVolumeMounts.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECVolumeMounts.java
deleted file mode 100644
index 45288849bcb..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecECVolumeMounts.java
+++ /dev/null
@@ -1,192 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "mountPath",
-    "mountPropagation",
-    "name",
-    "readOnly",
-    "recursiveReadOnly",
-    "subPath",
-    "subPathExpr"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecECVolumeMounts implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecECVolumeMountsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("mountPath")
-    private String mountPath;
-    @JsonProperty("mountPropagation")
-    private String mountPropagation;
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("readOnly")
-    private Boolean readOnly;
-    @JsonProperty("recursiveReadOnly")
-    private String recursiveReadOnly;
-    @JsonProperty("subPath")
-    private String subPath;
-    @JsonProperty("subPathExpr")
-    private String subPathExpr;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecECVolumeMounts() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecECVolumeMounts(String mountPath, String mountPropagation, String name, Boolean readOnly, String recursiveReadOnly, String subPath, String subPathExpr) {
-        super();
-        this.mountPath = mountPath;
-        this.mountPropagation = mountPropagation;
-        this.name = name;
-        this.readOnly = readOnly;
-        this.recursiveReadOnly = recursiveReadOnly;
-        this.subPath = subPath;
-        this.subPathExpr = subPathExpr;
-    }
-
-    @JsonProperty("mountPath")
-    public String getMountPath() {
-        return mountPath;
-    }
-
-    @JsonProperty("mountPath")
-    public void setMountPath(String mountPath) {
-        this.mountPath = mountPath;
-    }
-
-    @JsonProperty("mountPropagation")
-    public String getMountPropagation() {
-        return mountPropagation;
-    }
-
-    @JsonProperty("mountPropagation")
-    public void setMountPropagation(String mountPropagation) {
-        this.mountPropagation = mountPropagation;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("readOnly")
-    public Boolean getReadOnly() {
-        return readOnly;
-    }
-
-    @JsonProperty("readOnly")
-    public void setReadOnly(Boolean readOnly) {
-        this.readOnly = readOnly;
-    }
-
-    @JsonProperty("recursiveReadOnly")
-    public String getRecursiveReadOnly() {
-        return recursiveReadOnly;
-    }
-
-    @JsonProperty("recursiveReadOnly")
-    public void setRecursiveReadOnly(String recursiveReadOnly) {
-        this.recursiveReadOnly = recursiveReadOnly;
-    }
-
-    @JsonProperty("subPath")
-    public String getSubPath() {
-        return subPath;
-    }
-
-    @JsonProperty("subPath")
-    public void setSubPath(String subPath) {
-        this.subPath = subPath;
-    }
-
-    @JsonProperty("subPathExpr")
-    public String getSubPathExpr() {
-        return subPathExpr;
-    }
-
-    @JsonProperty("subPathExpr")
-    public void setSubPathExpr(String subPathExpr) {
-        this.subPathExpr = subPathExpr;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECVolumeMountsBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecECVolumeMountsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecECVolumeMountsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecEphemeralContainers.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecEphemeralContainers.java
deleted file mode 100644
index d12b7436b1e..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecEphemeralContainers.java
+++ /dev/null
@@ -1,463 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.fabric8.kubernetes.api.model.VolumeDevice;
-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({
-    "args",
-    "command",
-    "env",
-    "envFrom",
-    "image",
-    "imagePullPolicy",
-    "lifecycle",
-    "livenessProbe",
-    "name",
-    "ports",
-    "readinessProbe",
-    "resizePolicy",
-    "resources",
-    "restartPolicy",
-    "securityContext",
-    "startupProbe",
-    "stdin",
-    "stdinOnce",
-    "targetContainerName",
-    "terminationMessagePath",
-    "terminationMessagePolicy",
-    "tty",
-    "volumeDevices",
-    "volumeMounts",
-    "workingDir"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecEphemeralContainers implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecEphemeralContainersBuilder> , KubernetesResource
-{
-
-    @JsonProperty("args")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> args = new ArrayList<>();
-    @JsonProperty("command")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> command = new ArrayList<>();
-    @JsonProperty("env")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecECEnv> env = new ArrayList<>();
-    @JsonProperty("envFrom")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecECEnvFrom> envFrom = new ArrayList<>();
-    @JsonProperty("image")
-    private String image;
-    @JsonProperty("imagePullPolicy")
-    private String imagePullPolicy;
-    @JsonProperty("lifecycle")
-    private ClusterServiceVersionSpecISpecDSpecTSpecECLifecycle lifecycle;
-    @JsonProperty("livenessProbe")
-    private ClusterServiceVersionSpecISpecDSpecTSpecECLivenessProbe livenessProbe;
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("ports")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecECPorts> ports = new ArrayList<>();
-    @JsonProperty("readinessProbe")
-    private ClusterServiceVersionSpecISpecDSpecTSpecECReadinessProbe readinessProbe;
-    @JsonProperty("resizePolicy")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecECResizePolicy> resizePolicy = new ArrayList<>();
-    @JsonProperty("resources")
-    private ClusterServiceVersionSpecISpecDSpecTSpecECResources resources;
-    @JsonProperty("restartPolicy")
-    private String restartPolicy;
-    @JsonProperty("securityContext")
-    private ClusterServiceVersionSpecISpecDSpecTSpecECSecurityContext securityContext;
-    @JsonProperty("startupProbe")
-    private ClusterServiceVersionSpecISpecDSpecTSpecECStartupProbe startupProbe;
-    @JsonProperty("stdin")
-    private Boolean stdin;
-    @JsonProperty("stdinOnce")
-    private Boolean stdinOnce;
-    @JsonProperty("targetContainerName")
-    private String targetContainerName;
-    @JsonProperty("terminationMessagePath")
-    private String terminationMessagePath;
-    @JsonProperty("terminationMessagePolicy")
-    private String terminationMessagePolicy;
-    @JsonProperty("tty")
-    private Boolean tty;
-    @JsonProperty("volumeDevices")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<VolumeDevice> volumeDevices = new ArrayList<>();
-    @JsonProperty("volumeMounts")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecECVolumeMounts> volumeMounts = new ArrayList<>();
-    @JsonProperty("workingDir")
-    private String workingDir;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecEphemeralContainers() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecEphemeralContainers(List<String> args, List<String> command, List<ClusterServiceVersionSpecISpecDSpecTSpecECEnv> env, List<ClusterServiceVersionSpecISpecDSpecTSpecECEnvFrom> envFrom, String image, String imagePullPolicy, ClusterServiceVersionSpecISpecDSpecTSpecECLifecycle lifecycle, ClusterServiceVersionSpecISpecDSpecTSpecECLivenessProbe livenessProbe, String name, List<ClusterServiceVersionSpecISpecDSpecTSpecECPorts> ports, ClusterServiceVersionSpecISpecDSpecTSpecECReadinessProbe readinessProbe, List<ClusterServiceVersionSpecISpecDSpecTSpecECResizePolicy> resizePolicy, ClusterServiceVersionSpecISpecDSpecTSpecECResources resources, String restartPolicy, ClusterServiceVersionSpecISpecDSpecTSpecECSecurityContext securityContext, ClusterServiceVersionSpecISpecDSpecTSpecECStartupProbe startupProbe, Boolean stdin, Boolean stdinOnce, String targetContainerName, String terminationMessagePath, String terminationMessagePolicy, Boolean tty, List<VolumeDevice> volumeDevices, List<ClusterServiceVersionSpecISpecDSpecTSpecECVolumeMounts> volumeMounts, String workingDir) {
-        super();
-        this.args = args;
-        this.command = command;
-        this.env = env;
-        this.envFrom = envFrom;
-        this.image = image;
-        this.imagePullPolicy = imagePullPolicy;
-        this.lifecycle = lifecycle;
-        this.livenessProbe = livenessProbe;
-        this.name = name;
-        this.ports = ports;
-        this.readinessProbe = readinessProbe;
-        this.resizePolicy = resizePolicy;
-        this.resources = resources;
-        this.restartPolicy = restartPolicy;
-        this.securityContext = securityContext;
-        this.startupProbe = startupProbe;
-        this.stdin = stdin;
-        this.stdinOnce = stdinOnce;
-        this.targetContainerName = targetContainerName;
-        this.terminationMessagePath = terminationMessagePath;
-        this.terminationMessagePolicy = terminationMessagePolicy;
-        this.tty = tty;
-        this.volumeDevices = volumeDevices;
-        this.volumeMounts = volumeMounts;
-        this.workingDir = workingDir;
-    }
-
-    @JsonProperty("args")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getArgs() {
-        return args;
-    }
-
-    @JsonProperty("args")
-    public void setArgs(List<String> args) {
-        this.args = args;
-    }
-
-    @JsonProperty("command")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getCommand() {
-        return command;
-    }
-
-    @JsonProperty("command")
-    public void setCommand(List<String> command) {
-        this.command = command;
-    }
-
-    @JsonProperty("env")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecECEnv> getEnv() {
-        return env;
-    }
-
-    @JsonProperty("env")
-    public void setEnv(List<ClusterServiceVersionSpecISpecDSpecTSpecECEnv> env) {
-        this.env = env;
-    }
-
-    @JsonProperty("envFrom")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecECEnvFrom> getEnvFrom() {
-        return envFrom;
-    }
-
-    @JsonProperty("envFrom")
-    public void setEnvFrom(List<ClusterServiceVersionSpecISpecDSpecTSpecECEnvFrom> envFrom) {
-        this.envFrom = envFrom;
-    }
-
-    @JsonProperty("image")
-    public String getImage() {
-        return image;
-    }
-
-    @JsonProperty("image")
-    public void setImage(String image) {
-        this.image = image;
-    }
-
-    @JsonProperty("imagePullPolicy")
-    public String getImagePullPolicy() {
-        return imagePullPolicy;
-    }
-
-    @JsonProperty("imagePullPolicy")
-    public void setImagePullPolicy(String imagePullPolicy) {
-        this.imagePullPolicy = imagePullPolicy;
-    }
-
-    @JsonProperty("lifecycle")
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLifecycle getLifecycle() {
-        return lifecycle;
-    }
-
-    @JsonProperty("lifecycle")
-    public void setLifecycle(ClusterServiceVersionSpecISpecDSpecTSpecECLifecycle lifecycle) {
-        this.lifecycle = lifecycle;
-    }
-
-    @JsonProperty("livenessProbe")
-    public ClusterServiceVersionSpecISpecDSpecTSpecECLivenessProbe getLivenessProbe() {
-        return livenessProbe;
-    }
-
-    @JsonProperty("livenessProbe")
-    public void setLivenessProbe(ClusterServiceVersionSpecISpecDSpecTSpecECLivenessProbe livenessProbe) {
-        this.livenessProbe = livenessProbe;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("ports")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecECPorts> getPorts() {
-        return ports;
-    }
-
-    @JsonProperty("ports")
-    public void setPorts(List<ClusterServiceVersionSpecISpecDSpecTSpecECPorts> ports) {
-        this.ports = ports;
-    }
-
-    @JsonProperty("readinessProbe")
-    public ClusterServiceVersionSpecISpecDSpecTSpecECReadinessProbe getReadinessProbe() {
-        return readinessProbe;
-    }
-
-    @JsonProperty("readinessProbe")
-    public void setReadinessProbe(ClusterServiceVersionSpecISpecDSpecTSpecECReadinessProbe readinessProbe) {
-        this.readinessProbe = readinessProbe;
-    }
-
-    @JsonProperty("resizePolicy")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecECResizePolicy> getResizePolicy() {
-        return resizePolicy;
-    }
-
-    @JsonProperty("resizePolicy")
-    public void setResizePolicy(List<ClusterServiceVersionSpecISpecDSpecTSpecECResizePolicy> resizePolicy) {
-        this.resizePolicy = resizePolicy;
-    }
-
-    @JsonProperty("resources")
-    public ClusterServiceVersionSpecISpecDSpecTSpecECResources getResources() {
-        return resources;
-    }
-
-    @JsonProperty("resources")
-    public void setResources(ClusterServiceVersionSpecISpecDSpecTSpecECResources resources) {
-        this.resources = resources;
-    }
-
-    @JsonProperty("restartPolicy")
-    public String getRestartPolicy() {
-        return restartPolicy;
-    }
-
-    @JsonProperty("restartPolicy")
-    public void setRestartPolicy(String restartPolicy) {
-        this.restartPolicy = restartPolicy;
-    }
-
-    @JsonProperty("securityContext")
-    public ClusterServiceVersionSpecISpecDSpecTSpecECSecurityContext getSecurityContext() {
-        return securityContext;
-    }
-
-    @JsonProperty("securityContext")
-    public void setSecurityContext(ClusterServiceVersionSpecISpecDSpecTSpecECSecurityContext securityContext) {
-        this.securityContext = securityContext;
-    }
-
-    @JsonProperty("startupProbe")
-    public ClusterServiceVersionSpecISpecDSpecTSpecECStartupProbe getStartupProbe() {
-        return startupProbe;
-    }
-
-    @JsonProperty("startupProbe")
-    public void setStartupProbe(ClusterServiceVersionSpecISpecDSpecTSpecECStartupProbe startupProbe) {
-        this.startupProbe = startupProbe;
-    }
-
-    @JsonProperty("stdin")
-    public Boolean getStdin() {
-        return stdin;
-    }
-
-    @JsonProperty("stdin")
-    public void setStdin(Boolean stdin) {
-        this.stdin = stdin;
-    }
-
-    @JsonProperty("stdinOnce")
-    public Boolean getStdinOnce() {
-        return stdinOnce;
-    }
-
-    @JsonProperty("stdinOnce")
-    public void setStdinOnce(Boolean stdinOnce) {
-        this.stdinOnce = stdinOnce;
-    }
-
-    @JsonProperty("targetContainerName")
-    public String getTargetContainerName() {
-        return targetContainerName;
-    }
-
-    @JsonProperty("targetContainerName")
-    public void setTargetContainerName(String targetContainerName) {
-        this.targetContainerName = targetContainerName;
-    }
-
-    @JsonProperty("terminationMessagePath")
-    public String getTerminationMessagePath() {
-        return terminationMessagePath;
-    }
-
-    @JsonProperty("terminationMessagePath")
-    public void setTerminationMessagePath(String terminationMessagePath) {
-        this.terminationMessagePath = terminationMessagePath;
-    }
-
-    @JsonProperty("terminationMessagePolicy")
-    public String getTerminationMessagePolicy() {
-        return terminationMessagePolicy;
-    }
-
-    @JsonProperty("terminationMessagePolicy")
-    public void setTerminationMessagePolicy(String terminationMessagePolicy) {
-        this.terminationMessagePolicy = terminationMessagePolicy;
-    }
-
-    @JsonProperty("tty")
-    public Boolean getTty() {
-        return tty;
-    }
-
-    @JsonProperty("tty")
-    public void setTty(Boolean tty) {
-        this.tty = tty;
-    }
-
-    @JsonProperty("volumeDevices")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<VolumeDevice> getVolumeDevices() {
-        return volumeDevices;
-    }
-
-    @JsonProperty("volumeDevices")
-    public void setVolumeDevices(List<VolumeDevice> volumeDevices) {
-        this.volumeDevices = volumeDevices;
-    }
-
-    @JsonProperty("volumeMounts")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecECVolumeMounts> getVolumeMounts() {
-        return volumeMounts;
-    }
-
-    @JsonProperty("volumeMounts")
-    public void setVolumeMounts(List<ClusterServiceVersionSpecISpecDSpecTSpecECVolumeMounts> volumeMounts) {
-        this.volumeMounts = volumeMounts;
-    }
-
-    @JsonProperty("workingDir")
-    public String getWorkingDir() {
-        return workingDir;
-    }
-
-    @JsonProperty("workingDir")
-    public void setWorkingDir(String workingDir) {
-        this.workingDir = workingDir;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecEphemeralContainersBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecEphemeralContainersBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecEphemeralContainersBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecHostAliases.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecHostAliases.java
deleted file mode 100644
index d4ecf44eed8..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecHostAliases.java
+++ /dev/null
@@ -1,126 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "hostnames",
-    "ip"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecHostAliases implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecHostAliasesBuilder> , KubernetesResource
-{
-
-    @JsonProperty("hostnames")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> hostnames = new ArrayList<>();
-    @JsonProperty("ip")
-    private String ip;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecHostAliases() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecHostAliases(List<String> hostnames, String ip) {
-        super();
-        this.hostnames = hostnames;
-        this.ip = ip;
-    }
-
-    @JsonProperty("hostnames")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getHostnames() {
-        return hostnames;
-    }
-
-    @JsonProperty("hostnames")
-    public void setHostnames(List<String> hostnames) {
-        this.hostnames = hostnames;
-    }
-
-    @JsonProperty("ip")
-    public String getIp() {
-        return ip;
-    }
-
-    @JsonProperty("ip")
-    public void setIp(String ip) {
-        this.ip = ip;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecHostAliasesBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecHostAliasesBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecHostAliasesBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICEFConfigMapRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICEFConfigMapRef.java
deleted file mode 100644
index 105536870dc..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICEFConfigMapRef.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name",
-    "optional"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecICEFConfigMapRef implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecICEFConfigMapRefBuilder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("optional")
-    private Boolean optional;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecICEFConfigMapRef() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecICEFConfigMapRef(String name, Boolean optional) {
-        super();
-        this.name = name;
-        this.optional = optional;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("optional")
-    public Boolean getOptional() {
-        return optional;
-    }
-
-    @JsonProperty("optional")
-    public void setOptional(Boolean optional) {
-        this.optional = optional;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICEFConfigMapRefBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecICEFConfigMapRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICEFConfigMapRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICEFSecretRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICEFSecretRef.java
deleted file mode 100644
index e5bdf7aeee9..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICEFSecretRef.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name",
-    "optional"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecICEFSecretRef implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecICEFSecretRefBuilder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("optional")
-    private Boolean optional;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecICEFSecretRef() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecICEFSecretRef(String name, Boolean optional) {
-        super();
-        this.name = name;
-        this.optional = optional;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("optional")
-    public Boolean getOptional() {
-        return optional;
-    }
-
-    @JsonProperty("optional")
-    public void setOptional(Boolean optional) {
-        this.optional = optional;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICEFSecretRefBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecICEFSecretRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICEFSecretRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICEVFConfigMapKeyRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICEVFConfigMapKeyRef.java
deleted file mode 100644
index eb67a174a94..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICEVFConfigMapKeyRef.java
+++ /dev/null
@@ -1,136 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "name",
-    "optional"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecICEVFConfigMapKeyRef implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecICEVFConfigMapKeyRefBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("optional")
-    private Boolean optional;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecICEVFConfigMapKeyRef() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecICEVFConfigMapKeyRef(String key, String name, Boolean optional) {
-        super();
-        this.key = key;
-        this.name = name;
-        this.optional = optional;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("optional")
-    public Boolean getOptional() {
-        return optional;
-    }
-
-    @JsonProperty("optional")
-    public void setOptional(Boolean optional) {
-        this.optional = optional;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICEVFConfigMapKeyRefBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecICEVFConfigMapKeyRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICEVFConfigMapKeyRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICEVFFieldRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICEVFFieldRef.java
deleted file mode 100644
index 1955021bf5b..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICEVFFieldRef.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "apiVersion",
-    "fieldPath"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecICEVFFieldRef implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecICEVFFieldRefBuilder> , KubernetesResource
-{
-
-    @JsonProperty("apiVersion")
-    private String apiVersion;
-    @JsonProperty("fieldPath")
-    private String fieldPath;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecICEVFFieldRef() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecICEVFFieldRef(String apiVersion, String fieldPath) {
-        super();
-        this.apiVersion = apiVersion;
-        this.fieldPath = fieldPath;
-    }
-
-    @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;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICEVFFieldRefBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecICEVFFieldRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICEVFFieldRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICEVFResourceFieldRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICEVFResourceFieldRef.java
deleted file mode 100644
index bcb4e9ce704..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICEVFResourceFieldRef.java
+++ /dev/null
@@ -1,138 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "containerName",
-    "divisor",
-    "resource"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecICEVFResourceFieldRef implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecICEVFResourceFieldRefBuilder> , KubernetesResource
-{
-
-    @JsonProperty("containerName")
-    private String containerName;
-    @JsonProperty("divisor")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object divisor;
-    @JsonProperty("resource")
-    private String resource;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecICEVFResourceFieldRef() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecICEVFResourceFieldRef(String containerName, Object divisor, String resource) {
-        super();
-        this.containerName = containerName;
-        this.divisor = divisor;
-        this.resource = resource;
-    }
-
-    @JsonProperty("containerName")
-    public String getContainerName() {
-        return containerName;
-    }
-
-    @JsonProperty("containerName")
-    public void setContainerName(String containerName) {
-        this.containerName = containerName;
-    }
-
-    @JsonProperty("divisor")
-    public Object getDivisor() {
-        return divisor;
-    }
-
-    @JsonProperty("divisor")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setDivisor(Object divisor) {
-        this.divisor = divisor;
-    }
-
-    @JsonProperty("resource")
-    public String getResource() {
-        return resource;
-    }
-
-    @JsonProperty("resource")
-    public void setResource(String resource) {
-        this.resource = resource;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICEVFResourceFieldRefBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecICEVFResourceFieldRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICEVFResourceFieldRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICEVFSecretKeyRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICEVFSecretKeyRef.java
deleted file mode 100644
index 83a8feaba4e..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICEVFSecretKeyRef.java
+++ /dev/null
@@ -1,136 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "name",
-    "optional"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecICEVFSecretKeyRef implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecICEVFSecretKeyRefBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("optional")
-    private Boolean optional;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecICEVFSecretKeyRef() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecICEVFSecretKeyRef(String key, String name, Boolean optional) {
-        super();
-        this.key = key;
-        this.name = name;
-        this.optional = optional;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("optional")
-    public Boolean getOptional() {
-        return optional;
-    }
-
-    @JsonProperty("optional")
-    public void setOptional(Boolean optional) {
-        this.optional = optional;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICEVFSecretKeyRefBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecICEVFSecretKeyRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICEVFSecretKeyRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICEValueFrom.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICEValueFrom.java
deleted file mode 100644
index 960da22a3a0..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICEValueFrom.java
+++ /dev/null
@@ -1,150 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "configMapKeyRef",
-    "fieldRef",
-    "resourceFieldRef",
-    "secretKeyRef"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecICEValueFrom implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecICEValueFromBuilder> , KubernetesResource
-{
-
-    @JsonProperty("configMapKeyRef")
-    private ClusterServiceVersionSpecISpecDSpecTSpecICEVFConfigMapKeyRef configMapKeyRef;
-    @JsonProperty("fieldRef")
-    private ClusterServiceVersionSpecISpecDSpecTSpecICEVFFieldRef fieldRef;
-    @JsonProperty("resourceFieldRef")
-    private ClusterServiceVersionSpecISpecDSpecTSpecICEVFResourceFieldRef resourceFieldRef;
-    @JsonProperty("secretKeyRef")
-    private ClusterServiceVersionSpecISpecDSpecTSpecICEVFSecretKeyRef secretKeyRef;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecICEValueFrom() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecICEValueFrom(ClusterServiceVersionSpecISpecDSpecTSpecICEVFConfigMapKeyRef configMapKeyRef, ClusterServiceVersionSpecISpecDSpecTSpecICEVFFieldRef fieldRef, ClusterServiceVersionSpecISpecDSpecTSpecICEVFResourceFieldRef resourceFieldRef, ClusterServiceVersionSpecISpecDSpecTSpecICEVFSecretKeyRef secretKeyRef) {
-        super();
-        this.configMapKeyRef = configMapKeyRef;
-        this.fieldRef = fieldRef;
-        this.resourceFieldRef = resourceFieldRef;
-        this.secretKeyRef = secretKeyRef;
-    }
-
-    @JsonProperty("configMapKeyRef")
-    public ClusterServiceVersionSpecISpecDSpecTSpecICEVFConfigMapKeyRef getConfigMapKeyRef() {
-        return configMapKeyRef;
-    }
-
-    @JsonProperty("configMapKeyRef")
-    public void setConfigMapKeyRef(ClusterServiceVersionSpecISpecDSpecTSpecICEVFConfigMapKeyRef configMapKeyRef) {
-        this.configMapKeyRef = configMapKeyRef;
-    }
-
-    @JsonProperty("fieldRef")
-    public ClusterServiceVersionSpecISpecDSpecTSpecICEVFFieldRef getFieldRef() {
-        return fieldRef;
-    }
-
-    @JsonProperty("fieldRef")
-    public void setFieldRef(ClusterServiceVersionSpecISpecDSpecTSpecICEVFFieldRef fieldRef) {
-        this.fieldRef = fieldRef;
-    }
-
-    @JsonProperty("resourceFieldRef")
-    public ClusterServiceVersionSpecISpecDSpecTSpecICEVFResourceFieldRef getResourceFieldRef() {
-        return resourceFieldRef;
-    }
-
-    @JsonProperty("resourceFieldRef")
-    public void setResourceFieldRef(ClusterServiceVersionSpecISpecDSpecTSpecICEVFResourceFieldRef resourceFieldRef) {
-        this.resourceFieldRef = resourceFieldRef;
-    }
-
-    @JsonProperty("secretKeyRef")
-    public ClusterServiceVersionSpecISpecDSpecTSpecICEVFSecretKeyRef getSecretKeyRef() {
-        return secretKeyRef;
-    }
-
-    @JsonProperty("secretKeyRef")
-    public void setSecretKeyRef(ClusterServiceVersionSpecISpecDSpecTSpecICEVFSecretKeyRef secretKeyRef) {
-        this.secretKeyRef = secretKeyRef;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICEValueFromBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecICEValueFromBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICEValueFromBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICEnv.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICEnv.java
deleted file mode 100644
index 8c61aaf3fa2..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICEnv.java
+++ /dev/null
@@ -1,136 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name",
-    "value",
-    "valueFrom"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecICEnv implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecICEnvBuilder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("value")
-    private String value;
-    @JsonProperty("valueFrom")
-    private ClusterServiceVersionSpecISpecDSpecTSpecICEValueFrom valueFrom;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecICEnv() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecICEnv(String name, String value, ClusterServiceVersionSpecISpecDSpecTSpecICEValueFrom valueFrom) {
-        super();
-        this.name = name;
-        this.value = value;
-        this.valueFrom = valueFrom;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("value")
-    public String getValue() {
-        return value;
-    }
-
-    @JsonProperty("value")
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    @JsonProperty("valueFrom")
-    public ClusterServiceVersionSpecISpecDSpecTSpecICEValueFrom getValueFrom() {
-        return valueFrom;
-    }
-
-    @JsonProperty("valueFrom")
-    public void setValueFrom(ClusterServiceVersionSpecISpecDSpecTSpecICEValueFrom valueFrom) {
-        this.valueFrom = valueFrom;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICEnvBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecICEnvBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICEnvBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICEnvFrom.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICEnvFrom.java
deleted file mode 100644
index 080976f7805..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICEnvFrom.java
+++ /dev/null
@@ -1,136 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "configMapRef",
-    "prefix",
-    "secretRef"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecICEnvFrom implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecICEnvFromBuilder> , KubernetesResource
-{
-
-    @JsonProperty("configMapRef")
-    private ClusterServiceVersionSpecISpecDSpecTSpecICEFConfigMapRef configMapRef;
-    @JsonProperty("prefix")
-    private String prefix;
-    @JsonProperty("secretRef")
-    private ClusterServiceVersionSpecISpecDSpecTSpecICEFSecretRef secretRef;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecICEnvFrom() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecICEnvFrom(ClusterServiceVersionSpecISpecDSpecTSpecICEFConfigMapRef configMapRef, String prefix, ClusterServiceVersionSpecISpecDSpecTSpecICEFSecretRef secretRef) {
-        super();
-        this.configMapRef = configMapRef;
-        this.prefix = prefix;
-        this.secretRef = secretRef;
-    }
-
-    @JsonProperty("configMapRef")
-    public ClusterServiceVersionSpecISpecDSpecTSpecICEFConfigMapRef getConfigMapRef() {
-        return configMapRef;
-    }
-
-    @JsonProperty("configMapRef")
-    public void setConfigMapRef(ClusterServiceVersionSpecISpecDSpecTSpecICEFConfigMapRef configMapRef) {
-        this.configMapRef = configMapRef;
-    }
-
-    @JsonProperty("prefix")
-    public String getPrefix() {
-        return prefix;
-    }
-
-    @JsonProperty("prefix")
-    public void setPrefix(String prefix) {
-        this.prefix = prefix;
-    }
-
-    @JsonProperty("secretRef")
-    public ClusterServiceVersionSpecISpecDSpecTSpecICEFSecretRef getSecretRef() {
-        return secretRef;
-    }
-
-    @JsonProperty("secretRef")
-    public void setSecretRef(ClusterServiceVersionSpecISpecDSpecTSpecICEFSecretRef secretRef) {
-        this.secretRef = secretRef;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICEnvFromBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecICEnvFromBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICEnvFromBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLPExec.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLPExec.java
deleted file mode 100644
index 3e76ed4f2f4..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLPExec.java
+++ /dev/null
@@ -1,112 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "command"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecICLPExec implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecICLPExecBuilder> , KubernetesResource
-{
-
-    @JsonProperty("command")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> command = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPExec() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPExec(List<String> command) {
-        super();
-        this.command = command;
-    }
-
-    @JsonProperty("command")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getCommand() {
-        return command;
-    }
-
-    @JsonProperty("command")
-    public void setCommand(List<String> command) {
-        this.command = command;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPExecBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecICLPExecBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPExecBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLPGrpc.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLPGrpc.java
deleted file mode 100644
index 6f4bc16a3a1..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLPGrpc.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "port",
-    "service"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecICLPGrpc implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecICLPGrpcBuilder> , KubernetesResource
-{
-
-    @JsonProperty("port")
-    private Integer port;
-    @JsonProperty("service")
-    private String service;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPGrpc() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPGrpc(Integer port, String service) {
-        super();
-        this.port = port;
-        this.service = service;
-    }
-
-    @JsonProperty("port")
-    public Integer getPort() {
-        return port;
-    }
-
-    @JsonProperty("port")
-    public void setPort(Integer port) {
-        this.port = port;
-    }
-
-    @JsonProperty("service")
-    public String getService() {
-        return service;
-    }
-
-    @JsonProperty("service")
-    public void setService(String service) {
-        this.service = service;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPGrpcBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecICLPGrpcBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPGrpcBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLPHGHttpHeaders.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLPHGHttpHeaders.java
deleted file mode 100644
index 41e3565e73c..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLPHGHttpHeaders.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name",
-    "value"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecICLPHGHttpHeaders implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecICLPHGHttpHeadersBuilder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("value")
-    private String value;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPHGHttpHeaders() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPHGHttpHeaders(String name, String value) {
-        super();
-        this.name = name;
-        this.value = value;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("value")
-    public String getValue() {
-        return value;
-    }
-
-    @JsonProperty("value")
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPHGHttpHeadersBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecICLPHGHttpHeadersBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPHGHttpHeadersBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLPHttpGet.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLPHttpGet.java
deleted file mode 100644
index 767da30f6c2..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLPHttpGet.java
+++ /dev/null
@@ -1,170 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "host",
-    "httpHeaders",
-    "path",
-    "port",
-    "scheme"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecICLPHttpGet implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecICLPHttpGetBuilder> , KubernetesResource
-{
-
-    @JsonProperty("host")
-    private String host;
-    @JsonProperty("httpHeaders")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecICLPHGHttpHeaders> httpHeaders = new ArrayList<>();
-    @JsonProperty("path")
-    private String path;
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object port;
-    @JsonProperty("scheme")
-    private String scheme;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPHttpGet() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPHttpGet(String host, List<ClusterServiceVersionSpecISpecDSpecTSpecICLPHGHttpHeaders> httpHeaders, String path, Object port, String scheme) {
-        super();
-        this.host = host;
-        this.httpHeaders = httpHeaders;
-        this.path = path;
-        this.port = port;
-        this.scheme = scheme;
-    }
-
-    @JsonProperty("host")
-    public String getHost() {
-        return host;
-    }
-
-    @JsonProperty("host")
-    public void setHost(String host) {
-        this.host = host;
-    }
-
-    @JsonProperty("httpHeaders")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecICLPHGHttpHeaders> getHttpHeaders() {
-        return httpHeaders;
-    }
-
-    @JsonProperty("httpHeaders")
-    public void setHttpHeaders(List<ClusterServiceVersionSpecISpecDSpecTSpecICLPHGHttpHeaders> httpHeaders) {
-        this.httpHeaders = httpHeaders;
-    }
-
-    @JsonProperty("path")
-    public String getPath() {
-        return path;
-    }
-
-    @JsonProperty("path")
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @JsonProperty("port")
-    public Object getPort() {
-        return port;
-    }
-
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setPort(Object port) {
-        this.port = port;
-    }
-
-    @JsonProperty("scheme")
-    public String getScheme() {
-        return scheme;
-    }
-
-    @JsonProperty("scheme")
-    public void setScheme(String scheme) {
-        this.scheme = scheme;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPHttpGetBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecICLPHttpGetBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPHttpGetBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLPSExec.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLPSExec.java
deleted file mode 100644
index b7295ff90e8..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLPSExec.java
+++ /dev/null
@@ -1,112 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "command"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecICLPSExec implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecICLPSExecBuilder> , KubernetesResource
-{
-
-    @JsonProperty("command")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> command = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPSExec() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPSExec(List<String> command) {
-        super();
-        this.command = command;
-    }
-
-    @JsonProperty("command")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getCommand() {
-        return command;
-    }
-
-    @JsonProperty("command")
-    public void setCommand(List<String> command) {
-        this.command = command;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPSExecBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecICLPSExecBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPSExecBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLPSExec_1.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLPSExec_1.java
deleted file mode 100644
index 7fad153a873..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLPSExec_1.java
+++ /dev/null
@@ -1,112 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "command"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecICLPSExec_1 implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecICLPSExec_1Builder> , KubernetesResource
-{
-
-    @JsonProperty("command")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> command = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPSExec_1() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPSExec_1(List<String> command) {
-        super();
-        this.command = command;
-    }
-
-    @JsonProperty("command")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getCommand() {
-        return command;
-    }
-
-    @JsonProperty("command")
-    public void setCommand(List<String> command) {
-        this.command = command;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPSExec_1Builder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecICLPSExec_1Builder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPSExec_1Builder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLPSHGHttpHeaders.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLPSHGHttpHeaders.java
deleted file mode 100644
index 3db87bd21c3..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLPSHGHttpHeaders.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name",
-    "value"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecICLPSHGHttpHeaders implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecICLPSHGHttpHeadersBuilder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("value")
-    private String value;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPSHGHttpHeaders() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPSHGHttpHeaders(String name, String value) {
-        super();
-        this.name = name;
-        this.value = value;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("value")
-    public String getValue() {
-        return value;
-    }
-
-    @JsonProperty("value")
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPSHGHttpHeadersBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecICLPSHGHttpHeadersBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPSHGHttpHeadersBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLPSHGHttpHeaders_1.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLPSHGHttpHeaders_1.java
deleted file mode 100644
index 3693ff68ecc..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLPSHGHttpHeaders_1.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name",
-    "value"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecICLPSHGHttpHeaders_1 implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecICLPSHGHttpHeaders_1Builder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("value")
-    private String value;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPSHGHttpHeaders_1() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPSHGHttpHeaders_1(String name, String value) {
-        super();
-        this.name = name;
-        this.value = value;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("value")
-    public String getValue() {
-        return value;
-    }
-
-    @JsonProperty("value")
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPSHGHttpHeaders_1Builder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecICLPSHGHttpHeaders_1Builder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPSHGHttpHeaders_1Builder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLPSHttpGet.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLPSHttpGet.java
deleted file mode 100644
index 2415c02bdd8..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLPSHttpGet.java
+++ /dev/null
@@ -1,170 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "host",
-    "httpHeaders",
-    "path",
-    "port",
-    "scheme"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecICLPSHttpGet implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecICLPSHttpGetBuilder> , KubernetesResource
-{
-
-    @JsonProperty("host")
-    private String host;
-    @JsonProperty("httpHeaders")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecICLPSHGHttpHeaders> httpHeaders = new ArrayList<>();
-    @JsonProperty("path")
-    private String path;
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object port;
-    @JsonProperty("scheme")
-    private String scheme;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPSHttpGet() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPSHttpGet(String host, List<ClusterServiceVersionSpecISpecDSpecTSpecICLPSHGHttpHeaders> httpHeaders, String path, Object port, String scheme) {
-        super();
-        this.host = host;
-        this.httpHeaders = httpHeaders;
-        this.path = path;
-        this.port = port;
-        this.scheme = scheme;
-    }
-
-    @JsonProperty("host")
-    public String getHost() {
-        return host;
-    }
-
-    @JsonProperty("host")
-    public void setHost(String host) {
-        this.host = host;
-    }
-
-    @JsonProperty("httpHeaders")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecICLPSHGHttpHeaders> getHttpHeaders() {
-        return httpHeaders;
-    }
-
-    @JsonProperty("httpHeaders")
-    public void setHttpHeaders(List<ClusterServiceVersionSpecISpecDSpecTSpecICLPSHGHttpHeaders> httpHeaders) {
-        this.httpHeaders = httpHeaders;
-    }
-
-    @JsonProperty("path")
-    public String getPath() {
-        return path;
-    }
-
-    @JsonProperty("path")
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @JsonProperty("port")
-    public Object getPort() {
-        return port;
-    }
-
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setPort(Object port) {
-        this.port = port;
-    }
-
-    @JsonProperty("scheme")
-    public String getScheme() {
-        return scheme;
-    }
-
-    @JsonProperty("scheme")
-    public void setScheme(String scheme) {
-        this.scheme = scheme;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPSHttpGetBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecICLPSHttpGetBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPSHttpGetBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLPSHttpGet_1.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLPSHttpGet_1.java
deleted file mode 100644
index cf86ef23d07..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLPSHttpGet_1.java
+++ /dev/null
@@ -1,170 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "host",
-    "httpHeaders",
-    "path",
-    "port",
-    "scheme"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecICLPSHttpGet_1 implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecICLPSHttpGet_1Builder> , KubernetesResource
-{
-
-    @JsonProperty("host")
-    private String host;
-    @JsonProperty("httpHeaders")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecICLPSHGHttpHeaders_1> httpHeaders = new ArrayList<>();
-    @JsonProperty("path")
-    private String path;
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object port;
-    @JsonProperty("scheme")
-    private String scheme;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPSHttpGet_1() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPSHttpGet_1(String host, List<ClusterServiceVersionSpecISpecDSpecTSpecICLPSHGHttpHeaders_1> httpHeaders, String path, Object port, String scheme) {
-        super();
-        this.host = host;
-        this.httpHeaders = httpHeaders;
-        this.path = path;
-        this.port = port;
-        this.scheme = scheme;
-    }
-
-    @JsonProperty("host")
-    public String getHost() {
-        return host;
-    }
-
-    @JsonProperty("host")
-    public void setHost(String host) {
-        this.host = host;
-    }
-
-    @JsonProperty("httpHeaders")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecICLPSHGHttpHeaders_1> getHttpHeaders() {
-        return httpHeaders;
-    }
-
-    @JsonProperty("httpHeaders")
-    public void setHttpHeaders(List<ClusterServiceVersionSpecISpecDSpecTSpecICLPSHGHttpHeaders_1> httpHeaders) {
-        this.httpHeaders = httpHeaders;
-    }
-
-    @JsonProperty("path")
-    public String getPath() {
-        return path;
-    }
-
-    @JsonProperty("path")
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @JsonProperty("port")
-    public Object getPort() {
-        return port;
-    }
-
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setPort(Object port) {
-        this.port = port;
-    }
-
-    @JsonProperty("scheme")
-    public String getScheme() {
-        return scheme;
-    }
-
-    @JsonProperty("scheme")
-    public void setScheme(String scheme) {
-        this.scheme = scheme;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPSHttpGet_1Builder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecICLPSHttpGet_1Builder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPSHttpGet_1Builder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLPSSleep.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLPSSleep.java
deleted file mode 100644
index ffb98196a5b..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLPSSleep.java
+++ /dev/null
@@ -1,108 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "seconds"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecICLPSSleep implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecICLPSSleepBuilder> , KubernetesResource
-{
-
-    @JsonProperty("seconds")
-    private Long seconds;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPSSleep() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPSSleep(Long seconds) {
-        super();
-        this.seconds = seconds;
-    }
-
-    @JsonProperty("seconds")
-    public Long getSeconds() {
-        return seconds;
-    }
-
-    @JsonProperty("seconds")
-    public void setSeconds(Long seconds) {
-        this.seconds = seconds;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPSSleepBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecICLPSSleepBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPSSleepBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLPSSleep_1.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLPSSleep_1.java
deleted file mode 100644
index 8d37352ee91..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLPSSleep_1.java
+++ /dev/null
@@ -1,108 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "seconds"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecICLPSSleep_1 implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecICLPSSleep_1Builder> , KubernetesResource
-{
-
-    @JsonProperty("seconds")
-    private Long seconds;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPSSleep_1() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPSSleep_1(Long seconds) {
-        super();
-        this.seconds = seconds;
-    }
-
-    @JsonProperty("seconds")
-    public Long getSeconds() {
-        return seconds;
-    }
-
-    @JsonProperty("seconds")
-    public void setSeconds(Long seconds) {
-        this.seconds = seconds;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPSSleep_1Builder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecICLPSSleep_1Builder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPSSleep_1Builder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLPSTcpSocket.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLPSTcpSocket.java
deleted file mode 100644
index 651092a8d5d..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLPSTcpSocket.java
+++ /dev/null
@@ -1,124 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "host",
-    "port"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecICLPSTcpSocket implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecICLPSTcpSocketBuilder> , KubernetesResource
-{
-
-    @JsonProperty("host")
-    private String host;
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object port;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPSTcpSocket() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPSTcpSocket(String host, Object port) {
-        super();
-        this.host = host;
-        this.port = port;
-    }
-
-    @JsonProperty("host")
-    public String getHost() {
-        return host;
-    }
-
-    @JsonProperty("host")
-    public void setHost(String host) {
-        this.host = host;
-    }
-
-    @JsonProperty("port")
-    public Object getPort() {
-        return port;
-    }
-
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setPort(Object port) {
-        this.port = port;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPSTcpSocketBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecICLPSTcpSocketBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPSTcpSocketBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLPSTcpSocket_1.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLPSTcpSocket_1.java
deleted file mode 100644
index fc512f9df66..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLPSTcpSocket_1.java
+++ /dev/null
@@ -1,124 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "host",
-    "port"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecICLPSTcpSocket_1 implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecICLPSTcpSocket_1Builder> , KubernetesResource
-{
-
-    @JsonProperty("host")
-    private String host;
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object port;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPSTcpSocket_1() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPSTcpSocket_1(String host, Object port) {
-        super();
-        this.host = host;
-        this.port = port;
-    }
-
-    @JsonProperty("host")
-    public String getHost() {
-        return host;
-    }
-
-    @JsonProperty("host")
-    public void setHost(String host) {
-        this.host = host;
-    }
-
-    @JsonProperty("port")
-    public Object getPort() {
-        return port;
-    }
-
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setPort(Object port) {
-        this.port = port;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPSTcpSocket_1Builder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecICLPSTcpSocket_1Builder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPSTcpSocket_1Builder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLPTcpSocket.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLPTcpSocket.java
deleted file mode 100644
index dbdf8d0e99e..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLPTcpSocket.java
+++ /dev/null
@@ -1,124 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "host",
-    "port"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecICLPTcpSocket implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecICLPTcpSocketBuilder> , KubernetesResource
-{
-
-    @JsonProperty("host")
-    private String host;
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object port;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPTcpSocket() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPTcpSocket(String host, Object port) {
-        super();
-        this.host = host;
-        this.port = port;
-    }
-
-    @JsonProperty("host")
-    public String getHost() {
-        return host;
-    }
-
-    @JsonProperty("host")
-    public void setHost(String host) {
-        this.host = host;
-    }
-
-    @JsonProperty("port")
-    public Object getPort() {
-        return port;
-    }
-
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setPort(Object port) {
-        this.port = port;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPTcpSocketBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecICLPTcpSocketBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPTcpSocketBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLPostStart.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLPostStart.java
deleted file mode 100644
index c56f212c164..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLPostStart.java
+++ /dev/null
@@ -1,150 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "exec",
-    "httpGet",
-    "sleep",
-    "tcpSocket"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecICLPostStart implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecICLPostStartBuilder> , KubernetesResource
-{
-
-    @JsonProperty("exec")
-    private ClusterServiceVersionSpecISpecDSpecTSpecICLPSExec exec;
-    @JsonProperty("httpGet")
-    private ClusterServiceVersionSpecISpecDSpecTSpecICLPSHttpGet httpGet;
-    @JsonProperty("sleep")
-    private ClusterServiceVersionSpecISpecDSpecTSpecICLPSSleep sleep;
-    @JsonProperty("tcpSocket")
-    private ClusterServiceVersionSpecISpecDSpecTSpecICLPSTcpSocket tcpSocket;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPostStart() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPostStart(ClusterServiceVersionSpecISpecDSpecTSpecICLPSExec exec, ClusterServiceVersionSpecISpecDSpecTSpecICLPSHttpGet httpGet, ClusterServiceVersionSpecISpecDSpecTSpecICLPSSleep sleep, ClusterServiceVersionSpecISpecDSpecTSpecICLPSTcpSocket tcpSocket) {
-        super();
-        this.exec = exec;
-        this.httpGet = httpGet;
-        this.sleep = sleep;
-        this.tcpSocket = tcpSocket;
-    }
-
-    @JsonProperty("exec")
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPSExec getExec() {
-        return exec;
-    }
-
-    @JsonProperty("exec")
-    public void setExec(ClusterServiceVersionSpecISpecDSpecTSpecICLPSExec exec) {
-        this.exec = exec;
-    }
-
-    @JsonProperty("httpGet")
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPSHttpGet getHttpGet() {
-        return httpGet;
-    }
-
-    @JsonProperty("httpGet")
-    public void setHttpGet(ClusterServiceVersionSpecISpecDSpecTSpecICLPSHttpGet httpGet) {
-        this.httpGet = httpGet;
-    }
-
-    @JsonProperty("sleep")
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPSSleep getSleep() {
-        return sleep;
-    }
-
-    @JsonProperty("sleep")
-    public void setSleep(ClusterServiceVersionSpecISpecDSpecTSpecICLPSSleep sleep) {
-        this.sleep = sleep;
-    }
-
-    @JsonProperty("tcpSocket")
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPSTcpSocket getTcpSocket() {
-        return tcpSocket;
-    }
-
-    @JsonProperty("tcpSocket")
-    public void setTcpSocket(ClusterServiceVersionSpecISpecDSpecTSpecICLPSTcpSocket tcpSocket) {
-        this.tcpSocket = tcpSocket;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPostStartBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecICLPostStartBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPostStartBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLPreStop.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLPreStop.java
deleted file mode 100644
index 9066330a4a1..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLPreStop.java
+++ /dev/null
@@ -1,150 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "exec",
-    "httpGet",
-    "sleep",
-    "tcpSocket"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecICLPreStop implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecICLPreStopBuilder> , KubernetesResource
-{
-
-    @JsonProperty("exec")
-    private ClusterServiceVersionSpecISpecDSpecTSpecICLPSExec_1 exec;
-    @JsonProperty("httpGet")
-    private ClusterServiceVersionSpecISpecDSpecTSpecICLPSHttpGet_1 httpGet;
-    @JsonProperty("sleep")
-    private ClusterServiceVersionSpecISpecDSpecTSpecICLPSSleep_1 sleep;
-    @JsonProperty("tcpSocket")
-    private ClusterServiceVersionSpecISpecDSpecTSpecICLPSTcpSocket_1 tcpSocket;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPreStop() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPreStop(ClusterServiceVersionSpecISpecDSpecTSpecICLPSExec_1 exec, ClusterServiceVersionSpecISpecDSpecTSpecICLPSHttpGet_1 httpGet, ClusterServiceVersionSpecISpecDSpecTSpecICLPSSleep_1 sleep, ClusterServiceVersionSpecISpecDSpecTSpecICLPSTcpSocket_1 tcpSocket) {
-        super();
-        this.exec = exec;
-        this.httpGet = httpGet;
-        this.sleep = sleep;
-        this.tcpSocket = tcpSocket;
-    }
-
-    @JsonProperty("exec")
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPSExec_1 getExec() {
-        return exec;
-    }
-
-    @JsonProperty("exec")
-    public void setExec(ClusterServiceVersionSpecISpecDSpecTSpecICLPSExec_1 exec) {
-        this.exec = exec;
-    }
-
-    @JsonProperty("httpGet")
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPSHttpGet_1 getHttpGet() {
-        return httpGet;
-    }
-
-    @JsonProperty("httpGet")
-    public void setHttpGet(ClusterServiceVersionSpecISpecDSpecTSpecICLPSHttpGet_1 httpGet) {
-        this.httpGet = httpGet;
-    }
-
-    @JsonProperty("sleep")
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPSSleep_1 getSleep() {
-        return sleep;
-    }
-
-    @JsonProperty("sleep")
-    public void setSleep(ClusterServiceVersionSpecISpecDSpecTSpecICLPSSleep_1 sleep) {
-        this.sleep = sleep;
-    }
-
-    @JsonProperty("tcpSocket")
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPSTcpSocket_1 getTcpSocket() {
-        return tcpSocket;
-    }
-
-    @JsonProperty("tcpSocket")
-    public void setTcpSocket(ClusterServiceVersionSpecISpecDSpecTSpecICLPSTcpSocket_1 tcpSocket) {
-        this.tcpSocket = tcpSocket;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPreStopBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecICLPreStopBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPreStopBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLifecycle.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLifecycle.java
deleted file mode 100644
index 8bd64903b09..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLifecycle.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "postStart",
-    "preStop"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecICLifecycle implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecICLifecycleBuilder> , KubernetesResource
-{
-
-    @JsonProperty("postStart")
-    private ClusterServiceVersionSpecISpecDSpecTSpecICLPostStart postStart;
-    @JsonProperty("preStop")
-    private ClusterServiceVersionSpecISpecDSpecTSpecICLPreStop preStop;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLifecycle() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLifecycle(ClusterServiceVersionSpecISpecDSpecTSpecICLPostStart postStart, ClusterServiceVersionSpecISpecDSpecTSpecICLPreStop preStop) {
-        super();
-        this.postStart = postStart;
-        this.preStop = preStop;
-    }
-
-    @JsonProperty("postStart")
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPostStart getPostStart() {
-        return postStart;
-    }
-
-    @JsonProperty("postStart")
-    public void setPostStart(ClusterServiceVersionSpecISpecDSpecTSpecICLPostStart postStart) {
-        this.postStart = postStart;
-    }
-
-    @JsonProperty("preStop")
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPreStop getPreStop() {
-        return preStop;
-    }
-
-    @JsonProperty("preStop")
-    public void setPreStop(ClusterServiceVersionSpecISpecDSpecTSpecICLPreStop preStop) {
-        this.preStop = preStop;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLifecycleBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecICLifecycleBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLifecycleBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLivenessProbe.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLivenessProbe.java
deleted file mode 100644
index 56c066f58c3..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICLivenessProbe.java
+++ /dev/null
@@ -1,234 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "exec",
-    "failureThreshold",
-    "grpc",
-    "httpGet",
-    "initialDelaySeconds",
-    "periodSeconds",
-    "successThreshold",
-    "tcpSocket",
-    "terminationGracePeriodSeconds",
-    "timeoutSeconds"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecICLivenessProbe implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecICLivenessProbeBuilder> , KubernetesResource
-{
-
-    @JsonProperty("exec")
-    private ClusterServiceVersionSpecISpecDSpecTSpecICLPExec exec;
-    @JsonProperty("failureThreshold")
-    private Integer failureThreshold;
-    @JsonProperty("grpc")
-    private ClusterServiceVersionSpecISpecDSpecTSpecICLPGrpc grpc;
-    @JsonProperty("httpGet")
-    private ClusterServiceVersionSpecISpecDSpecTSpecICLPHttpGet httpGet;
-    @JsonProperty("initialDelaySeconds")
-    private Integer initialDelaySeconds;
-    @JsonProperty("periodSeconds")
-    private Integer periodSeconds;
-    @JsonProperty("successThreshold")
-    private Integer successThreshold;
-    @JsonProperty("tcpSocket")
-    private ClusterServiceVersionSpecISpecDSpecTSpecICLPTcpSocket tcpSocket;
-    @JsonProperty("terminationGracePeriodSeconds")
-    private Long terminationGracePeriodSeconds;
-    @JsonProperty("timeoutSeconds")
-    private Integer timeoutSeconds;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLivenessProbe() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLivenessProbe(ClusterServiceVersionSpecISpecDSpecTSpecICLPExec exec, Integer failureThreshold, ClusterServiceVersionSpecISpecDSpecTSpecICLPGrpc grpc, ClusterServiceVersionSpecISpecDSpecTSpecICLPHttpGet httpGet, Integer initialDelaySeconds, Integer periodSeconds, Integer successThreshold, ClusterServiceVersionSpecISpecDSpecTSpecICLPTcpSocket tcpSocket, Long terminationGracePeriodSeconds, Integer timeoutSeconds) {
-        super();
-        this.exec = exec;
-        this.failureThreshold = failureThreshold;
-        this.grpc = grpc;
-        this.httpGet = httpGet;
-        this.initialDelaySeconds = initialDelaySeconds;
-        this.periodSeconds = periodSeconds;
-        this.successThreshold = successThreshold;
-        this.tcpSocket = tcpSocket;
-        this.terminationGracePeriodSeconds = terminationGracePeriodSeconds;
-        this.timeoutSeconds = timeoutSeconds;
-    }
-
-    @JsonProperty("exec")
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPExec getExec() {
-        return exec;
-    }
-
-    @JsonProperty("exec")
-    public void setExec(ClusterServiceVersionSpecISpecDSpecTSpecICLPExec exec) {
-        this.exec = exec;
-    }
-
-    @JsonProperty("failureThreshold")
-    public Integer getFailureThreshold() {
-        return failureThreshold;
-    }
-
-    @JsonProperty("failureThreshold")
-    public void setFailureThreshold(Integer failureThreshold) {
-        this.failureThreshold = failureThreshold;
-    }
-
-    @JsonProperty("grpc")
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPGrpc getGrpc() {
-        return grpc;
-    }
-
-    @JsonProperty("grpc")
-    public void setGrpc(ClusterServiceVersionSpecISpecDSpecTSpecICLPGrpc grpc) {
-        this.grpc = grpc;
-    }
-
-    @JsonProperty("httpGet")
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPHttpGet getHttpGet() {
-        return httpGet;
-    }
-
-    @JsonProperty("httpGet")
-    public void setHttpGet(ClusterServiceVersionSpecISpecDSpecTSpecICLPHttpGet httpGet) {
-        this.httpGet = httpGet;
-    }
-
-    @JsonProperty("initialDelaySeconds")
-    public Integer getInitialDelaySeconds() {
-        return initialDelaySeconds;
-    }
-
-    @JsonProperty("initialDelaySeconds")
-    public void setInitialDelaySeconds(Integer initialDelaySeconds) {
-        this.initialDelaySeconds = initialDelaySeconds;
-    }
-
-    @JsonProperty("periodSeconds")
-    public Integer getPeriodSeconds() {
-        return periodSeconds;
-    }
-
-    @JsonProperty("periodSeconds")
-    public void setPeriodSeconds(Integer periodSeconds) {
-        this.periodSeconds = periodSeconds;
-    }
-
-    @JsonProperty("successThreshold")
-    public Integer getSuccessThreshold() {
-        return successThreshold;
-    }
-
-    @JsonProperty("successThreshold")
-    public void setSuccessThreshold(Integer successThreshold) {
-        this.successThreshold = successThreshold;
-    }
-
-    @JsonProperty("tcpSocket")
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLPTcpSocket getTcpSocket() {
-        return tcpSocket;
-    }
-
-    @JsonProperty("tcpSocket")
-    public void setTcpSocket(ClusterServiceVersionSpecISpecDSpecTSpecICLPTcpSocket tcpSocket) {
-        this.tcpSocket = tcpSocket;
-    }
-
-    @JsonProperty("terminationGracePeriodSeconds")
-    public Long getTerminationGracePeriodSeconds() {
-        return terminationGracePeriodSeconds;
-    }
-
-    @JsonProperty("terminationGracePeriodSeconds")
-    public void setTerminationGracePeriodSeconds(Long terminationGracePeriodSeconds) {
-        this.terminationGracePeriodSeconds = terminationGracePeriodSeconds;
-    }
-
-    @JsonProperty("timeoutSeconds")
-    public Integer getTimeoutSeconds() {
-        return timeoutSeconds;
-    }
-
-    @JsonProperty("timeoutSeconds")
-    public void setTimeoutSeconds(Integer timeoutSeconds) {
-        this.timeoutSeconds = timeoutSeconds;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLivenessProbeBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecICLivenessProbeBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLivenessProbeBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICPorts.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICPorts.java
deleted file mode 100644
index d039f1df030..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICPorts.java
+++ /dev/null
@@ -1,164 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "containerPort",
-    "hostIP",
-    "hostPort",
-    "name",
-    "protocol"
-})
-@ToString
-@EqualsAndHashCode
-@Accessors(prefix = {
-    "_",
-    ""
-})
-@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
-    @BuildableReference(ObjectMeta.class),
-    @BuildableReference(LabelSelector.class),
-    @BuildableReference(Container.class),
-    @BuildableReference(PodTemplateSpec.class),
-    @BuildableReference(ResourceRequirements.class),
-    @BuildableReference(IntOrString.class),
-    @BuildableReference(ObjectReference.class),
-    @BuildableReference(LocalObjectReference.class),
-    @BuildableReference(PersistentVolumeClaim.class)
-})
-@Generated("jsonschema2pojo")
-public class ClusterServiceVersionSpecISpecDSpecTSpecICPorts implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecICPortsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("containerPort")
-    private Integer containerPort;
-    @JsonProperty("hostIP")
-    private String hostIP;
-    @JsonProperty("hostPort")
-    private Integer hostPort;
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("protocol")
-    private String protocol;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecICPorts() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecICPorts(Integer containerPort, String hostIP, Integer hostPort, String name, String protocol) {
-        super();
-        this.containerPort = containerPort;
-        this.hostIP = hostIP;
-        this.hostPort = hostPort;
-        this.name = name;
-        this.protocol = protocol;
-    }
-
-    @JsonProperty("containerPort")
-    public Integer getContainerPort() {
-        return containerPort;
-    }
-
-    @JsonProperty("containerPort")
-    public void setContainerPort(Integer containerPort) {
-        this.containerPort = containerPort;
-    }
-
-    @JsonProperty("hostIP")
-    public String getHostIP() {
-        return hostIP;
-    }
-
-    @JsonProperty("hostIP")
-    public void setHostIP(String hostIP) {
-        this.hostIP = hostIP;
-    }
-
-    @JsonProperty("hostPort")
-    public Integer getHostPort() {
-        return hostPort;
-    }
-
-    @JsonProperty("hostPort")
-    public void setHostPort(Integer hostPort) {
-        this.hostPort = hostPort;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("protocol")
-    public String getProtocol() {
-        return protocol;
-    }
-
-    @JsonProperty("protocol")
-    public void setProtocol(String protocol) {
-        this.protocol = protocol;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICPortsBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecICPortsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICPortsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICRClaims.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICRClaims.java
deleted file mode 100644
index 53e4579b2f7..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICRClaims.java
+++ /dev/null
@@ -1,108 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecICRClaims implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecICRClaimsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecICRClaims() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecICRClaims(String name) {
-        super();
-        this.name = name;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICRClaimsBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecICRClaimsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICRClaimsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICRPExec.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICRPExec.java
deleted file mode 100644
index aa023074391..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICRPExec.java
+++ /dev/null
@@ -1,112 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "command"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecICRPExec implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecICRPExecBuilder> , KubernetesResource
-{
-
-    @JsonProperty("command")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> command = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecICRPExec() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecICRPExec(List<String> command) {
-        super();
-        this.command = command;
-    }
-
-    @JsonProperty("command")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getCommand() {
-        return command;
-    }
-
-    @JsonProperty("command")
-    public void setCommand(List<String> command) {
-        this.command = command;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICRPExecBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecICRPExecBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICRPExecBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICRPGrpc.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICRPGrpc.java
deleted file mode 100644
index 399c4792718..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICRPGrpc.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "port",
-    "service"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecICRPGrpc implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecICRPGrpcBuilder> , KubernetesResource
-{
-
-    @JsonProperty("port")
-    private Integer port;
-    @JsonProperty("service")
-    private String service;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecICRPGrpc() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecICRPGrpc(Integer port, String service) {
-        super();
-        this.port = port;
-        this.service = service;
-    }
-
-    @JsonProperty("port")
-    public Integer getPort() {
-        return port;
-    }
-
-    @JsonProperty("port")
-    public void setPort(Integer port) {
-        this.port = port;
-    }
-
-    @JsonProperty("service")
-    public String getService() {
-        return service;
-    }
-
-    @JsonProperty("service")
-    public void setService(String service) {
-        this.service = service;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICRPGrpcBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecICRPGrpcBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICRPGrpcBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICRPHGHttpHeaders.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICRPHGHttpHeaders.java
deleted file mode 100644
index 11e8661f444..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICRPHGHttpHeaders.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name",
-    "value"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecICRPHGHttpHeaders implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecICRPHGHttpHeadersBuilder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("value")
-    private String value;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecICRPHGHttpHeaders() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecICRPHGHttpHeaders(String name, String value) {
-        super();
-        this.name = name;
-        this.value = value;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("value")
-    public String getValue() {
-        return value;
-    }
-
-    @JsonProperty("value")
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICRPHGHttpHeadersBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecICRPHGHttpHeadersBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICRPHGHttpHeadersBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICRPHttpGet.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICRPHttpGet.java
deleted file mode 100644
index c16ada9a7ea..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICRPHttpGet.java
+++ /dev/null
@@ -1,170 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "host",
-    "httpHeaders",
-    "path",
-    "port",
-    "scheme"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecICRPHttpGet implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecICRPHttpGetBuilder> , KubernetesResource
-{
-
-    @JsonProperty("host")
-    private String host;
-    @JsonProperty("httpHeaders")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecICRPHGHttpHeaders> httpHeaders = new ArrayList<>();
-    @JsonProperty("path")
-    private String path;
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object port;
-    @JsonProperty("scheme")
-    private String scheme;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecICRPHttpGet() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecICRPHttpGet(String host, List<ClusterServiceVersionSpecISpecDSpecTSpecICRPHGHttpHeaders> httpHeaders, String path, Object port, String scheme) {
-        super();
-        this.host = host;
-        this.httpHeaders = httpHeaders;
-        this.path = path;
-        this.port = port;
-        this.scheme = scheme;
-    }
-
-    @JsonProperty("host")
-    public String getHost() {
-        return host;
-    }
-
-    @JsonProperty("host")
-    public void setHost(String host) {
-        this.host = host;
-    }
-
-    @JsonProperty("httpHeaders")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecICRPHGHttpHeaders> getHttpHeaders() {
-        return httpHeaders;
-    }
-
-    @JsonProperty("httpHeaders")
-    public void setHttpHeaders(List<ClusterServiceVersionSpecISpecDSpecTSpecICRPHGHttpHeaders> httpHeaders) {
-        this.httpHeaders = httpHeaders;
-    }
-
-    @JsonProperty("path")
-    public String getPath() {
-        return path;
-    }
-
-    @JsonProperty("path")
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @JsonProperty("port")
-    public Object getPort() {
-        return port;
-    }
-
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setPort(Object port) {
-        this.port = port;
-    }
-
-    @JsonProperty("scheme")
-    public String getScheme() {
-        return scheme;
-    }
-
-    @JsonProperty("scheme")
-    public void setScheme(String scheme) {
-        this.scheme = scheme;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICRPHttpGetBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecICRPHttpGetBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICRPHttpGetBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICRPTcpSocket.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICRPTcpSocket.java
deleted file mode 100644
index 35cd8ea8619..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICRPTcpSocket.java
+++ /dev/null
@@ -1,124 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "host",
-    "port"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecICRPTcpSocket implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecICRPTcpSocketBuilder> , KubernetesResource
-{
-
-    @JsonProperty("host")
-    private String host;
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object port;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecICRPTcpSocket() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecICRPTcpSocket(String host, Object port) {
-        super();
-        this.host = host;
-        this.port = port;
-    }
-
-    @JsonProperty("host")
-    public String getHost() {
-        return host;
-    }
-
-    @JsonProperty("host")
-    public void setHost(String host) {
-        this.host = host;
-    }
-
-    @JsonProperty("port")
-    public Object getPort() {
-        return port;
-    }
-
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setPort(Object port) {
-        this.port = port;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICRPTcpSocketBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecICRPTcpSocketBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICRPTcpSocketBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICReadinessProbe.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICReadinessProbe.java
deleted file mode 100644
index f39c6433480..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICReadinessProbe.java
+++ /dev/null
@@ -1,234 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "exec",
-    "failureThreshold",
-    "grpc",
-    "httpGet",
-    "initialDelaySeconds",
-    "periodSeconds",
-    "successThreshold",
-    "tcpSocket",
-    "terminationGracePeriodSeconds",
-    "timeoutSeconds"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecICReadinessProbe implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecICReadinessProbeBuilder> , KubernetesResource
-{
-
-    @JsonProperty("exec")
-    private ClusterServiceVersionSpecISpecDSpecTSpecICRPExec exec;
-    @JsonProperty("failureThreshold")
-    private Integer failureThreshold;
-    @JsonProperty("grpc")
-    private ClusterServiceVersionSpecISpecDSpecTSpecICRPGrpc grpc;
-    @JsonProperty("httpGet")
-    private ClusterServiceVersionSpecISpecDSpecTSpecICRPHttpGet httpGet;
-    @JsonProperty("initialDelaySeconds")
-    private Integer initialDelaySeconds;
-    @JsonProperty("periodSeconds")
-    private Integer periodSeconds;
-    @JsonProperty("successThreshold")
-    private Integer successThreshold;
-    @JsonProperty("tcpSocket")
-    private ClusterServiceVersionSpecISpecDSpecTSpecICRPTcpSocket tcpSocket;
-    @JsonProperty("terminationGracePeriodSeconds")
-    private Long terminationGracePeriodSeconds;
-    @JsonProperty("timeoutSeconds")
-    private Integer timeoutSeconds;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecICReadinessProbe() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecICReadinessProbe(ClusterServiceVersionSpecISpecDSpecTSpecICRPExec exec, Integer failureThreshold, ClusterServiceVersionSpecISpecDSpecTSpecICRPGrpc grpc, ClusterServiceVersionSpecISpecDSpecTSpecICRPHttpGet httpGet, Integer initialDelaySeconds, Integer periodSeconds, Integer successThreshold, ClusterServiceVersionSpecISpecDSpecTSpecICRPTcpSocket tcpSocket, Long terminationGracePeriodSeconds, Integer timeoutSeconds) {
-        super();
-        this.exec = exec;
-        this.failureThreshold = failureThreshold;
-        this.grpc = grpc;
-        this.httpGet = httpGet;
-        this.initialDelaySeconds = initialDelaySeconds;
-        this.periodSeconds = periodSeconds;
-        this.successThreshold = successThreshold;
-        this.tcpSocket = tcpSocket;
-        this.terminationGracePeriodSeconds = terminationGracePeriodSeconds;
-        this.timeoutSeconds = timeoutSeconds;
-    }
-
-    @JsonProperty("exec")
-    public ClusterServiceVersionSpecISpecDSpecTSpecICRPExec getExec() {
-        return exec;
-    }
-
-    @JsonProperty("exec")
-    public void setExec(ClusterServiceVersionSpecISpecDSpecTSpecICRPExec exec) {
-        this.exec = exec;
-    }
-
-    @JsonProperty("failureThreshold")
-    public Integer getFailureThreshold() {
-        return failureThreshold;
-    }
-
-    @JsonProperty("failureThreshold")
-    public void setFailureThreshold(Integer failureThreshold) {
-        this.failureThreshold = failureThreshold;
-    }
-
-    @JsonProperty("grpc")
-    public ClusterServiceVersionSpecISpecDSpecTSpecICRPGrpc getGrpc() {
-        return grpc;
-    }
-
-    @JsonProperty("grpc")
-    public void setGrpc(ClusterServiceVersionSpecISpecDSpecTSpecICRPGrpc grpc) {
-        this.grpc = grpc;
-    }
-
-    @JsonProperty("httpGet")
-    public ClusterServiceVersionSpecISpecDSpecTSpecICRPHttpGet getHttpGet() {
-        return httpGet;
-    }
-
-    @JsonProperty("httpGet")
-    public void setHttpGet(ClusterServiceVersionSpecISpecDSpecTSpecICRPHttpGet httpGet) {
-        this.httpGet = httpGet;
-    }
-
-    @JsonProperty("initialDelaySeconds")
-    public Integer getInitialDelaySeconds() {
-        return initialDelaySeconds;
-    }
-
-    @JsonProperty("initialDelaySeconds")
-    public void setInitialDelaySeconds(Integer initialDelaySeconds) {
-        this.initialDelaySeconds = initialDelaySeconds;
-    }
-
-    @JsonProperty("periodSeconds")
-    public Integer getPeriodSeconds() {
-        return periodSeconds;
-    }
-
-    @JsonProperty("periodSeconds")
-    public void setPeriodSeconds(Integer periodSeconds) {
-        this.periodSeconds = periodSeconds;
-    }
-
-    @JsonProperty("successThreshold")
-    public Integer getSuccessThreshold() {
-        return successThreshold;
-    }
-
-    @JsonProperty("successThreshold")
-    public void setSuccessThreshold(Integer successThreshold) {
-        this.successThreshold = successThreshold;
-    }
-
-    @JsonProperty("tcpSocket")
-    public ClusterServiceVersionSpecISpecDSpecTSpecICRPTcpSocket getTcpSocket() {
-        return tcpSocket;
-    }
-
-    @JsonProperty("tcpSocket")
-    public void setTcpSocket(ClusterServiceVersionSpecISpecDSpecTSpecICRPTcpSocket tcpSocket) {
-        this.tcpSocket = tcpSocket;
-    }
-
-    @JsonProperty("terminationGracePeriodSeconds")
-    public Long getTerminationGracePeriodSeconds() {
-        return terminationGracePeriodSeconds;
-    }
-
-    @JsonProperty("terminationGracePeriodSeconds")
-    public void setTerminationGracePeriodSeconds(Long terminationGracePeriodSeconds) {
-        this.terminationGracePeriodSeconds = terminationGracePeriodSeconds;
-    }
-
-    @JsonProperty("timeoutSeconds")
-    public Integer getTimeoutSeconds() {
-        return timeoutSeconds;
-    }
-
-    @JsonProperty("timeoutSeconds")
-    public void setTimeoutSeconds(Integer timeoutSeconds) {
-        this.timeoutSeconds = timeoutSeconds;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICReadinessProbeBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecICReadinessProbeBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICReadinessProbeBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICResizePolicy.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICResizePolicy.java
deleted file mode 100644
index 7de348f3f55..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICResizePolicy.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "resourceName",
-    "restartPolicy"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecICResizePolicy implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecICResizePolicyBuilder> , KubernetesResource
-{
-
-    @JsonProperty("resourceName")
-    private String resourceName;
-    @JsonProperty("restartPolicy")
-    private String restartPolicy;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecICResizePolicy() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecICResizePolicy(String resourceName, String restartPolicy) {
-        super();
-        this.resourceName = resourceName;
-        this.restartPolicy = restartPolicy;
-    }
-
-    @JsonProperty("resourceName")
-    public String getResourceName() {
-        return resourceName;
-    }
-
-    @JsonProperty("resourceName")
-    public void setResourceName(String resourceName) {
-        this.resourceName = resourceName;
-    }
-
-    @JsonProperty("restartPolicy")
-    public String getRestartPolicy() {
-        return restartPolicy;
-    }
-
-    @JsonProperty("restartPolicy")
-    public void setRestartPolicy(String restartPolicy) {
-        this.restartPolicy = restartPolicy;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICResizePolicyBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecICResizePolicyBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICResizePolicyBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICResources.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICResources.java
deleted file mode 100644
index 27720700b8b..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICResources.java
+++ /dev/null
@@ -1,148 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "claims",
-    "limits",
-    "requests"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecICResources implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecICResourcesBuilder> , KubernetesResource
-{
-
-    @JsonProperty("claims")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecICRClaims> claims = new ArrayList<>();
-    @JsonProperty("limits")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializerForMap.class)
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, Object> limits = new LinkedHashMap<>();
-    @JsonProperty("requests")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializerForMap.class)
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, Object> requests = new LinkedHashMap<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecICResources() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecICResources(List<ClusterServiceVersionSpecISpecDSpecTSpecICRClaims> claims, Map<String, Object> limits, Map<String, Object> requests) {
-        super();
-        this.claims = claims;
-        this.limits = limits;
-        this.requests = requests;
-    }
-
-    @JsonProperty("claims")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecICRClaims> getClaims() {
-        return claims;
-    }
-
-    @JsonProperty("claims")
-    public void setClaims(List<ClusterServiceVersionSpecISpecDSpecTSpecICRClaims> claims) {
-        this.claims = claims;
-    }
-
-    @JsonProperty("limits")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, Object> getLimits() {
-        return limits;
-    }
-
-    @JsonProperty("limits")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializerForMap.class)
-    public void setLimits(Map<String, Object> limits) {
-        this.limits = limits;
-    }
-
-    @JsonProperty("requests")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, Object> getRequests() {
-        return requests;
-    }
-
-    @JsonProperty("requests")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializerForMap.class)
-    public void setRequests(Map<String, Object> requests) {
-        this.requests = requests;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICResourcesBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecICResourcesBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICResourcesBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICSCAppArmorProfile.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICSCAppArmorProfile.java
deleted file mode 100644
index a00baa13cc5..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICSCAppArmorProfile.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "localhostProfile",
-    "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 ClusterServiceVersionSpecISpecDSpecTSpecICSCAppArmorProfile implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecICSCAppArmorProfileBuilder> , KubernetesResource
-{
-
-    @JsonProperty("localhostProfile")
-    private String localhostProfile;
-    @JsonProperty("type")
-    private String type;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSCAppArmorProfile() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSCAppArmorProfile(String localhostProfile, String type) {
-        super();
-        this.localhostProfile = localhostProfile;
-        this.type = type;
-    }
-
-    @JsonProperty("localhostProfile")
-    public String getLocalhostProfile() {
-        return localhostProfile;
-    }
-
-    @JsonProperty("localhostProfile")
-    public void setLocalhostProfile(String localhostProfile) {
-        this.localhostProfile = localhostProfile;
-    }
-
-    @JsonProperty("type")
-    public String getType() {
-        return type;
-    }
-
-    @JsonProperty("type")
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSCAppArmorProfileBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecICSCAppArmorProfileBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSCAppArmorProfileBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICSCCapabilities.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICSCCapabilities.java
deleted file mode 100644
index a5ee54590ba..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICSCCapabilities.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "add",
-    "drop"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecICSCCapabilities implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecICSCCapabilitiesBuilder> , KubernetesResource
-{
-
-    @JsonProperty("add")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> add = new ArrayList<>();
-    @JsonProperty("drop")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> drop = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSCCapabilities() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSCCapabilities(List<String> add, List<String> drop) {
-        super();
-        this.add = add;
-        this.drop = drop;
-    }
-
-    @JsonProperty("add")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getAdd() {
-        return add;
-    }
-
-    @JsonProperty("add")
-    public void setAdd(List<String> add) {
-        this.add = add;
-    }
-
-    @JsonProperty("drop")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getDrop() {
-        return drop;
-    }
-
-    @JsonProperty("drop")
-    public void setDrop(List<String> drop) {
-        this.drop = drop;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSCCapabilitiesBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecICSCCapabilitiesBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSCCapabilitiesBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICSCSeLinuxOptions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICSCSeLinuxOptions.java
deleted file mode 100644
index c160da9d9ce..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICSCSeLinuxOptions.java
+++ /dev/null
@@ -1,150 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "level",
-    "role",
-    "type",
-    "user"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecICSCSeLinuxOptions implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecICSCSeLinuxOptionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("level")
-    private String level;
-    @JsonProperty("role")
-    private String role;
-    @JsonProperty("type")
-    private String type;
-    @JsonProperty("user")
-    private String user;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSCSeLinuxOptions() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSCSeLinuxOptions(String level, String role, String type, String user) {
-        super();
-        this.level = level;
-        this.role = role;
-        this.type = type;
-        this.user = user;
-    }
-
-    @JsonProperty("level")
-    public String getLevel() {
-        return level;
-    }
-
-    @JsonProperty("level")
-    public void setLevel(String level) {
-        this.level = level;
-    }
-
-    @JsonProperty("role")
-    public String getRole() {
-        return role;
-    }
-
-    @JsonProperty("role")
-    public void setRole(String role) {
-        this.role = role;
-    }
-
-    @JsonProperty("type")
-    public String getType() {
-        return type;
-    }
-
-    @JsonProperty("type")
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    @JsonProperty("user")
-    public String getUser() {
-        return user;
-    }
-
-    @JsonProperty("user")
-    public void setUser(String user) {
-        this.user = user;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSCSeLinuxOptionsBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecICSCSeLinuxOptionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSCSeLinuxOptionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICSCSeccompProfile.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICSCSeccompProfile.java
deleted file mode 100644
index 3f421ca3e82..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICSCSeccompProfile.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "localhostProfile",
-    "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 ClusterServiceVersionSpecISpecDSpecTSpecICSCSeccompProfile implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecICSCSeccompProfileBuilder> , KubernetesResource
-{
-
-    @JsonProperty("localhostProfile")
-    private String localhostProfile;
-    @JsonProperty("type")
-    private String type;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSCSeccompProfile() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSCSeccompProfile(String localhostProfile, String type) {
-        super();
-        this.localhostProfile = localhostProfile;
-        this.type = type;
-    }
-
-    @JsonProperty("localhostProfile")
-    public String getLocalhostProfile() {
-        return localhostProfile;
-    }
-
-    @JsonProperty("localhostProfile")
-    public void setLocalhostProfile(String localhostProfile) {
-        this.localhostProfile = localhostProfile;
-    }
-
-    @JsonProperty("type")
-    public String getType() {
-        return type;
-    }
-
-    @JsonProperty("type")
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSCSeccompProfileBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecICSCSeccompProfileBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSCSeccompProfileBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICSCWindowsOptions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICSCWindowsOptions.java
deleted file mode 100644
index e052318ae2a..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICSCWindowsOptions.java
+++ /dev/null
@@ -1,150 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "gmsaCredentialSpec",
-    "gmsaCredentialSpecName",
-    "hostProcess",
-    "runAsUserName"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecICSCWindowsOptions implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecICSCWindowsOptionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("gmsaCredentialSpec")
-    private String gmsaCredentialSpec;
-    @JsonProperty("gmsaCredentialSpecName")
-    private String gmsaCredentialSpecName;
-    @JsonProperty("hostProcess")
-    private Boolean hostProcess;
-    @JsonProperty("runAsUserName")
-    private String runAsUserName;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSCWindowsOptions() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSCWindowsOptions(String gmsaCredentialSpec, String gmsaCredentialSpecName, Boolean hostProcess, String runAsUserName) {
-        super();
-        this.gmsaCredentialSpec = gmsaCredentialSpec;
-        this.gmsaCredentialSpecName = gmsaCredentialSpecName;
-        this.hostProcess = hostProcess;
-        this.runAsUserName = runAsUserName;
-    }
-
-    @JsonProperty("gmsaCredentialSpec")
-    public String getGmsaCredentialSpec() {
-        return gmsaCredentialSpec;
-    }
-
-    @JsonProperty("gmsaCredentialSpec")
-    public void setGmsaCredentialSpec(String gmsaCredentialSpec) {
-        this.gmsaCredentialSpec = gmsaCredentialSpec;
-    }
-
-    @JsonProperty("gmsaCredentialSpecName")
-    public String getGmsaCredentialSpecName() {
-        return gmsaCredentialSpecName;
-    }
-
-    @JsonProperty("gmsaCredentialSpecName")
-    public void setGmsaCredentialSpecName(String gmsaCredentialSpecName) {
-        this.gmsaCredentialSpecName = gmsaCredentialSpecName;
-    }
-
-    @JsonProperty("hostProcess")
-    public Boolean getHostProcess() {
-        return hostProcess;
-    }
-
-    @JsonProperty("hostProcess")
-    public void setHostProcess(Boolean hostProcess) {
-        this.hostProcess = hostProcess;
-    }
-
-    @JsonProperty("runAsUserName")
-    public String getRunAsUserName() {
-        return runAsUserName;
-    }
-
-    @JsonProperty("runAsUserName")
-    public void setRunAsUserName(String runAsUserName) {
-        this.runAsUserName = runAsUserName;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSCWindowsOptionsBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecICSCWindowsOptionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSCWindowsOptionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICSPExec.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICSPExec.java
deleted file mode 100644
index ba1441df1b7..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICSPExec.java
+++ /dev/null
@@ -1,112 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "command"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecICSPExec implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecICSPExecBuilder> , KubernetesResource
-{
-
-    @JsonProperty("command")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> command = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSPExec() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSPExec(List<String> command) {
-        super();
-        this.command = command;
-    }
-
-    @JsonProperty("command")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getCommand() {
-        return command;
-    }
-
-    @JsonProperty("command")
-    public void setCommand(List<String> command) {
-        this.command = command;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSPExecBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecICSPExecBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSPExecBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICSPGrpc.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICSPGrpc.java
deleted file mode 100644
index 04d56a84e9d..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICSPGrpc.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "port",
-    "service"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecICSPGrpc implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecICSPGrpcBuilder> , KubernetesResource
-{
-
-    @JsonProperty("port")
-    private Integer port;
-    @JsonProperty("service")
-    private String service;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSPGrpc() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSPGrpc(Integer port, String service) {
-        super();
-        this.port = port;
-        this.service = service;
-    }
-
-    @JsonProperty("port")
-    public Integer getPort() {
-        return port;
-    }
-
-    @JsonProperty("port")
-    public void setPort(Integer port) {
-        this.port = port;
-    }
-
-    @JsonProperty("service")
-    public String getService() {
-        return service;
-    }
-
-    @JsonProperty("service")
-    public void setService(String service) {
-        this.service = service;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSPGrpcBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecICSPGrpcBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSPGrpcBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICSPHGHttpHeaders.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICSPHGHttpHeaders.java
deleted file mode 100644
index e550fa8b6fe..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICSPHGHttpHeaders.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name",
-    "value"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecICSPHGHttpHeaders implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecICSPHGHttpHeadersBuilder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("value")
-    private String value;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSPHGHttpHeaders() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSPHGHttpHeaders(String name, String value) {
-        super();
-        this.name = name;
-        this.value = value;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("value")
-    public String getValue() {
-        return value;
-    }
-
-    @JsonProperty("value")
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSPHGHttpHeadersBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecICSPHGHttpHeadersBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSPHGHttpHeadersBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICSPHttpGet.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICSPHttpGet.java
deleted file mode 100644
index 90327fbf974..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICSPHttpGet.java
+++ /dev/null
@@ -1,170 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "host",
-    "httpHeaders",
-    "path",
-    "port",
-    "scheme"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecICSPHttpGet implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecICSPHttpGetBuilder> , KubernetesResource
-{
-
-    @JsonProperty("host")
-    private String host;
-    @JsonProperty("httpHeaders")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecICSPHGHttpHeaders> httpHeaders = new ArrayList<>();
-    @JsonProperty("path")
-    private String path;
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object port;
-    @JsonProperty("scheme")
-    private String scheme;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSPHttpGet() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSPHttpGet(String host, List<ClusterServiceVersionSpecISpecDSpecTSpecICSPHGHttpHeaders> httpHeaders, String path, Object port, String scheme) {
-        super();
-        this.host = host;
-        this.httpHeaders = httpHeaders;
-        this.path = path;
-        this.port = port;
-        this.scheme = scheme;
-    }
-
-    @JsonProperty("host")
-    public String getHost() {
-        return host;
-    }
-
-    @JsonProperty("host")
-    public void setHost(String host) {
-        this.host = host;
-    }
-
-    @JsonProperty("httpHeaders")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecICSPHGHttpHeaders> getHttpHeaders() {
-        return httpHeaders;
-    }
-
-    @JsonProperty("httpHeaders")
-    public void setHttpHeaders(List<ClusterServiceVersionSpecISpecDSpecTSpecICSPHGHttpHeaders> httpHeaders) {
-        this.httpHeaders = httpHeaders;
-    }
-
-    @JsonProperty("path")
-    public String getPath() {
-        return path;
-    }
-
-    @JsonProperty("path")
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @JsonProperty("port")
-    public Object getPort() {
-        return port;
-    }
-
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setPort(Object port) {
-        this.port = port;
-    }
-
-    @JsonProperty("scheme")
-    public String getScheme() {
-        return scheme;
-    }
-
-    @JsonProperty("scheme")
-    public void setScheme(String scheme) {
-        this.scheme = scheme;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSPHttpGetBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecICSPHttpGetBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSPHttpGetBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICSPTcpSocket.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICSPTcpSocket.java
deleted file mode 100644
index 192038250d3..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICSPTcpSocket.java
+++ /dev/null
@@ -1,124 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "host",
-    "port"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecICSPTcpSocket implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecICSPTcpSocketBuilder> , KubernetesResource
-{
-
-    @JsonProperty("host")
-    private String host;
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object port;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSPTcpSocket() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSPTcpSocket(String host, Object port) {
-        super();
-        this.host = host;
-        this.port = port;
-    }
-
-    @JsonProperty("host")
-    public String getHost() {
-        return host;
-    }
-
-    @JsonProperty("host")
-    public void setHost(String host) {
-        this.host = host;
-    }
-
-    @JsonProperty("port")
-    public Object getPort() {
-        return port;
-    }
-
-    @JsonProperty("port")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setPort(Object port) {
-        this.port = port;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSPTcpSocketBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecICSPTcpSocketBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSPTcpSocketBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICSecurityContext.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICSecurityContext.java
deleted file mode 100644
index 9390a378059..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICSecurityContext.java
+++ /dev/null
@@ -1,262 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "allowPrivilegeEscalation",
-    "appArmorProfile",
-    "capabilities",
-    "privileged",
-    "procMount",
-    "readOnlyRootFilesystem",
-    "runAsGroup",
-    "runAsNonRoot",
-    "runAsUser",
-    "seLinuxOptions",
-    "seccompProfile",
-    "windowsOptions"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecICSecurityContext implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecICSecurityContextBuilder> , KubernetesResource
-{
-
-    @JsonProperty("allowPrivilegeEscalation")
-    private Boolean allowPrivilegeEscalation;
-    @JsonProperty("appArmorProfile")
-    private ClusterServiceVersionSpecISpecDSpecTSpecICSCAppArmorProfile appArmorProfile;
-    @JsonProperty("capabilities")
-    private ClusterServiceVersionSpecISpecDSpecTSpecICSCCapabilities capabilities;
-    @JsonProperty("privileged")
-    private Boolean privileged;
-    @JsonProperty("procMount")
-    private String procMount;
-    @JsonProperty("readOnlyRootFilesystem")
-    private Boolean readOnlyRootFilesystem;
-    @JsonProperty("runAsGroup")
-    private Long runAsGroup;
-    @JsonProperty("runAsNonRoot")
-    private Boolean runAsNonRoot;
-    @JsonProperty("runAsUser")
-    private Long runAsUser;
-    @JsonProperty("seLinuxOptions")
-    private ClusterServiceVersionSpecISpecDSpecTSpecICSCSeLinuxOptions seLinuxOptions;
-    @JsonProperty("seccompProfile")
-    private ClusterServiceVersionSpecISpecDSpecTSpecICSCSeccompProfile seccompProfile;
-    @JsonProperty("windowsOptions")
-    private ClusterServiceVersionSpecISpecDSpecTSpecICSCWindowsOptions windowsOptions;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSecurityContext() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSecurityContext(Boolean allowPrivilegeEscalation, ClusterServiceVersionSpecISpecDSpecTSpecICSCAppArmorProfile appArmorProfile, ClusterServiceVersionSpecISpecDSpecTSpecICSCCapabilities capabilities, Boolean privileged, String procMount, Boolean readOnlyRootFilesystem, Long runAsGroup, Boolean runAsNonRoot, Long runAsUser, ClusterServiceVersionSpecISpecDSpecTSpecICSCSeLinuxOptions seLinuxOptions, ClusterServiceVersionSpecISpecDSpecTSpecICSCSeccompProfile seccompProfile, ClusterServiceVersionSpecISpecDSpecTSpecICSCWindowsOptions windowsOptions) {
-        super();
-        this.allowPrivilegeEscalation = allowPrivilegeEscalation;
-        this.appArmorProfile = appArmorProfile;
-        this.capabilities = capabilities;
-        this.privileged = privileged;
-        this.procMount = procMount;
-        this.readOnlyRootFilesystem = readOnlyRootFilesystem;
-        this.runAsGroup = runAsGroup;
-        this.runAsNonRoot = runAsNonRoot;
-        this.runAsUser = runAsUser;
-        this.seLinuxOptions = seLinuxOptions;
-        this.seccompProfile = seccompProfile;
-        this.windowsOptions = windowsOptions;
-    }
-
-    @JsonProperty("allowPrivilegeEscalation")
-    public Boolean getAllowPrivilegeEscalation() {
-        return allowPrivilegeEscalation;
-    }
-
-    @JsonProperty("allowPrivilegeEscalation")
-    public void setAllowPrivilegeEscalation(Boolean allowPrivilegeEscalation) {
-        this.allowPrivilegeEscalation = allowPrivilegeEscalation;
-    }
-
-    @JsonProperty("appArmorProfile")
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSCAppArmorProfile getAppArmorProfile() {
-        return appArmorProfile;
-    }
-
-    @JsonProperty("appArmorProfile")
-    public void setAppArmorProfile(ClusterServiceVersionSpecISpecDSpecTSpecICSCAppArmorProfile appArmorProfile) {
-        this.appArmorProfile = appArmorProfile;
-    }
-
-    @JsonProperty("capabilities")
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSCCapabilities getCapabilities() {
-        return capabilities;
-    }
-
-    @JsonProperty("capabilities")
-    public void setCapabilities(ClusterServiceVersionSpecISpecDSpecTSpecICSCCapabilities capabilities) {
-        this.capabilities = capabilities;
-    }
-
-    @JsonProperty("privileged")
-    public Boolean getPrivileged() {
-        return privileged;
-    }
-
-    @JsonProperty("privileged")
-    public void setPrivileged(Boolean privileged) {
-        this.privileged = privileged;
-    }
-
-    @JsonProperty("procMount")
-    public String getProcMount() {
-        return procMount;
-    }
-
-    @JsonProperty("procMount")
-    public void setProcMount(String procMount) {
-        this.procMount = procMount;
-    }
-
-    @JsonProperty("readOnlyRootFilesystem")
-    public Boolean getReadOnlyRootFilesystem() {
-        return readOnlyRootFilesystem;
-    }
-
-    @JsonProperty("readOnlyRootFilesystem")
-    public void setReadOnlyRootFilesystem(Boolean readOnlyRootFilesystem) {
-        this.readOnlyRootFilesystem = readOnlyRootFilesystem;
-    }
-
-    @JsonProperty("runAsGroup")
-    public Long getRunAsGroup() {
-        return runAsGroup;
-    }
-
-    @JsonProperty("runAsGroup")
-    public void setRunAsGroup(Long runAsGroup) {
-        this.runAsGroup = runAsGroup;
-    }
-
-    @JsonProperty("runAsNonRoot")
-    public Boolean getRunAsNonRoot() {
-        return runAsNonRoot;
-    }
-
-    @JsonProperty("runAsNonRoot")
-    public void setRunAsNonRoot(Boolean runAsNonRoot) {
-        this.runAsNonRoot = runAsNonRoot;
-    }
-
-    @JsonProperty("runAsUser")
-    public Long getRunAsUser() {
-        return runAsUser;
-    }
-
-    @JsonProperty("runAsUser")
-    public void setRunAsUser(Long runAsUser) {
-        this.runAsUser = runAsUser;
-    }
-
-    @JsonProperty("seLinuxOptions")
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSCSeLinuxOptions getSeLinuxOptions() {
-        return seLinuxOptions;
-    }
-
-    @JsonProperty("seLinuxOptions")
-    public void setSeLinuxOptions(ClusterServiceVersionSpecISpecDSpecTSpecICSCSeLinuxOptions seLinuxOptions) {
-        this.seLinuxOptions = seLinuxOptions;
-    }
-
-    @JsonProperty("seccompProfile")
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSCSeccompProfile getSeccompProfile() {
-        return seccompProfile;
-    }
-
-    @JsonProperty("seccompProfile")
-    public void setSeccompProfile(ClusterServiceVersionSpecISpecDSpecTSpecICSCSeccompProfile seccompProfile) {
-        this.seccompProfile = seccompProfile;
-    }
-
-    @JsonProperty("windowsOptions")
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSCWindowsOptions getWindowsOptions() {
-        return windowsOptions;
-    }
-
-    @JsonProperty("windowsOptions")
-    public void setWindowsOptions(ClusterServiceVersionSpecISpecDSpecTSpecICSCWindowsOptions windowsOptions) {
-        this.windowsOptions = windowsOptions;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSecurityContextBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecICSecurityContextBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSecurityContextBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICStartupProbe.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICStartupProbe.java
deleted file mode 100644
index d8c34ea39b3..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICStartupProbe.java
+++ /dev/null
@@ -1,234 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "exec",
-    "failureThreshold",
-    "grpc",
-    "httpGet",
-    "initialDelaySeconds",
-    "periodSeconds",
-    "successThreshold",
-    "tcpSocket",
-    "terminationGracePeriodSeconds",
-    "timeoutSeconds"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecICStartupProbe implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecICStartupProbeBuilder> , KubernetesResource
-{
-
-    @JsonProperty("exec")
-    private ClusterServiceVersionSpecISpecDSpecTSpecICSPExec exec;
-    @JsonProperty("failureThreshold")
-    private Integer failureThreshold;
-    @JsonProperty("grpc")
-    private ClusterServiceVersionSpecISpecDSpecTSpecICSPGrpc grpc;
-    @JsonProperty("httpGet")
-    private ClusterServiceVersionSpecISpecDSpecTSpecICSPHttpGet httpGet;
-    @JsonProperty("initialDelaySeconds")
-    private Integer initialDelaySeconds;
-    @JsonProperty("periodSeconds")
-    private Integer periodSeconds;
-    @JsonProperty("successThreshold")
-    private Integer successThreshold;
-    @JsonProperty("tcpSocket")
-    private ClusterServiceVersionSpecISpecDSpecTSpecICSPTcpSocket tcpSocket;
-    @JsonProperty("terminationGracePeriodSeconds")
-    private Long terminationGracePeriodSeconds;
-    @JsonProperty("timeoutSeconds")
-    private Integer timeoutSeconds;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecICStartupProbe() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecICStartupProbe(ClusterServiceVersionSpecISpecDSpecTSpecICSPExec exec, Integer failureThreshold, ClusterServiceVersionSpecISpecDSpecTSpecICSPGrpc grpc, ClusterServiceVersionSpecISpecDSpecTSpecICSPHttpGet httpGet, Integer initialDelaySeconds, Integer periodSeconds, Integer successThreshold, ClusterServiceVersionSpecISpecDSpecTSpecICSPTcpSocket tcpSocket, Long terminationGracePeriodSeconds, Integer timeoutSeconds) {
-        super();
-        this.exec = exec;
-        this.failureThreshold = failureThreshold;
-        this.grpc = grpc;
-        this.httpGet = httpGet;
-        this.initialDelaySeconds = initialDelaySeconds;
-        this.periodSeconds = periodSeconds;
-        this.successThreshold = successThreshold;
-        this.tcpSocket = tcpSocket;
-        this.terminationGracePeriodSeconds = terminationGracePeriodSeconds;
-        this.timeoutSeconds = timeoutSeconds;
-    }
-
-    @JsonProperty("exec")
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSPExec getExec() {
-        return exec;
-    }
-
-    @JsonProperty("exec")
-    public void setExec(ClusterServiceVersionSpecISpecDSpecTSpecICSPExec exec) {
-        this.exec = exec;
-    }
-
-    @JsonProperty("failureThreshold")
-    public Integer getFailureThreshold() {
-        return failureThreshold;
-    }
-
-    @JsonProperty("failureThreshold")
-    public void setFailureThreshold(Integer failureThreshold) {
-        this.failureThreshold = failureThreshold;
-    }
-
-    @JsonProperty("grpc")
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSPGrpc getGrpc() {
-        return grpc;
-    }
-
-    @JsonProperty("grpc")
-    public void setGrpc(ClusterServiceVersionSpecISpecDSpecTSpecICSPGrpc grpc) {
-        this.grpc = grpc;
-    }
-
-    @JsonProperty("httpGet")
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSPHttpGet getHttpGet() {
-        return httpGet;
-    }
-
-    @JsonProperty("httpGet")
-    public void setHttpGet(ClusterServiceVersionSpecISpecDSpecTSpecICSPHttpGet httpGet) {
-        this.httpGet = httpGet;
-    }
-
-    @JsonProperty("initialDelaySeconds")
-    public Integer getInitialDelaySeconds() {
-        return initialDelaySeconds;
-    }
-
-    @JsonProperty("initialDelaySeconds")
-    public void setInitialDelaySeconds(Integer initialDelaySeconds) {
-        this.initialDelaySeconds = initialDelaySeconds;
-    }
-
-    @JsonProperty("periodSeconds")
-    public Integer getPeriodSeconds() {
-        return periodSeconds;
-    }
-
-    @JsonProperty("periodSeconds")
-    public void setPeriodSeconds(Integer periodSeconds) {
-        this.periodSeconds = periodSeconds;
-    }
-
-    @JsonProperty("successThreshold")
-    public Integer getSuccessThreshold() {
-        return successThreshold;
-    }
-
-    @JsonProperty("successThreshold")
-    public void setSuccessThreshold(Integer successThreshold) {
-        this.successThreshold = successThreshold;
-    }
-
-    @JsonProperty("tcpSocket")
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSPTcpSocket getTcpSocket() {
-        return tcpSocket;
-    }
-
-    @JsonProperty("tcpSocket")
-    public void setTcpSocket(ClusterServiceVersionSpecISpecDSpecTSpecICSPTcpSocket tcpSocket) {
-        this.tcpSocket = tcpSocket;
-    }
-
-    @JsonProperty("terminationGracePeriodSeconds")
-    public Long getTerminationGracePeriodSeconds() {
-        return terminationGracePeriodSeconds;
-    }
-
-    @JsonProperty("terminationGracePeriodSeconds")
-    public void setTerminationGracePeriodSeconds(Long terminationGracePeriodSeconds) {
-        this.terminationGracePeriodSeconds = terminationGracePeriodSeconds;
-    }
-
-    @JsonProperty("timeoutSeconds")
-    public Integer getTimeoutSeconds() {
-        return timeoutSeconds;
-    }
-
-    @JsonProperty("timeoutSeconds")
-    public void setTimeoutSeconds(Integer timeoutSeconds) {
-        this.timeoutSeconds = timeoutSeconds;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICStartupProbeBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecICStartupProbeBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICStartupProbeBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICVolumeMounts.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICVolumeMounts.java
deleted file mode 100644
index b3bc37a01f0..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecICVolumeMounts.java
+++ /dev/null
@@ -1,192 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "mountPath",
-    "mountPropagation",
-    "name",
-    "readOnly",
-    "recursiveReadOnly",
-    "subPath",
-    "subPathExpr"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecICVolumeMounts implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecICVolumeMountsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("mountPath")
-    private String mountPath;
-    @JsonProperty("mountPropagation")
-    private String mountPropagation;
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("readOnly")
-    private Boolean readOnly;
-    @JsonProperty("recursiveReadOnly")
-    private String recursiveReadOnly;
-    @JsonProperty("subPath")
-    private String subPath;
-    @JsonProperty("subPathExpr")
-    private String subPathExpr;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecICVolumeMounts() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecICVolumeMounts(String mountPath, String mountPropagation, String name, Boolean readOnly, String recursiveReadOnly, String subPath, String subPathExpr) {
-        super();
-        this.mountPath = mountPath;
-        this.mountPropagation = mountPropagation;
-        this.name = name;
-        this.readOnly = readOnly;
-        this.recursiveReadOnly = recursiveReadOnly;
-        this.subPath = subPath;
-        this.subPathExpr = subPathExpr;
-    }
-
-    @JsonProperty("mountPath")
-    public String getMountPath() {
-        return mountPath;
-    }
-
-    @JsonProperty("mountPath")
-    public void setMountPath(String mountPath) {
-        this.mountPath = mountPath;
-    }
-
-    @JsonProperty("mountPropagation")
-    public String getMountPropagation() {
-        return mountPropagation;
-    }
-
-    @JsonProperty("mountPropagation")
-    public void setMountPropagation(String mountPropagation) {
-        this.mountPropagation = mountPropagation;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("readOnly")
-    public Boolean getReadOnly() {
-        return readOnly;
-    }
-
-    @JsonProperty("readOnly")
-    public void setReadOnly(Boolean readOnly) {
-        this.readOnly = readOnly;
-    }
-
-    @JsonProperty("recursiveReadOnly")
-    public String getRecursiveReadOnly() {
-        return recursiveReadOnly;
-    }
-
-    @JsonProperty("recursiveReadOnly")
-    public void setRecursiveReadOnly(String recursiveReadOnly) {
-        this.recursiveReadOnly = recursiveReadOnly;
-    }
-
-    @JsonProperty("subPath")
-    public String getSubPath() {
-        return subPath;
-    }
-
-    @JsonProperty("subPath")
-    public void setSubPath(String subPath) {
-        this.subPath = subPath;
-    }
-
-    @JsonProperty("subPathExpr")
-    public String getSubPathExpr() {
-        return subPathExpr;
-    }
-
-    @JsonProperty("subPathExpr")
-    public void setSubPathExpr(String subPathExpr) {
-        this.subPathExpr = subPathExpr;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICVolumeMountsBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecICVolumeMountsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecICVolumeMountsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecImagePullSecrets.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecImagePullSecrets.java
deleted file mode 100644
index 40c17d360e1..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecImagePullSecrets.java
+++ /dev/null
@@ -1,108 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecImagePullSecrets implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecImagePullSecretsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecImagePullSecrets() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecImagePullSecrets(String name) {
-        super();
-        this.name = name;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecImagePullSecretsBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecImagePullSecretsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecImagePullSecretsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecInitContainers.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecInitContainers.java
deleted file mode 100644
index cfa091c3432..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecInitContainers.java
+++ /dev/null
@@ -1,449 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.fabric8.kubernetes.api.model.VolumeDevice;
-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({
-    "args",
-    "command",
-    "env",
-    "envFrom",
-    "image",
-    "imagePullPolicy",
-    "lifecycle",
-    "livenessProbe",
-    "name",
-    "ports",
-    "readinessProbe",
-    "resizePolicy",
-    "resources",
-    "restartPolicy",
-    "securityContext",
-    "startupProbe",
-    "stdin",
-    "stdinOnce",
-    "terminationMessagePath",
-    "terminationMessagePolicy",
-    "tty",
-    "volumeDevices",
-    "volumeMounts",
-    "workingDir"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecInitContainers implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecInitContainersBuilder> , KubernetesResource
-{
-
-    @JsonProperty("args")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> args = new ArrayList<>();
-    @JsonProperty("command")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> command = new ArrayList<>();
-    @JsonProperty("env")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecICEnv> env = new ArrayList<>();
-    @JsonProperty("envFrom")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecICEnvFrom> envFrom = new ArrayList<>();
-    @JsonProperty("image")
-    private String image;
-    @JsonProperty("imagePullPolicy")
-    private String imagePullPolicy;
-    @JsonProperty("lifecycle")
-    private ClusterServiceVersionSpecISpecDSpecTSpecICLifecycle lifecycle;
-    @JsonProperty("livenessProbe")
-    private ClusterServiceVersionSpecISpecDSpecTSpecICLivenessProbe livenessProbe;
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("ports")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecICPorts> ports = new ArrayList<>();
-    @JsonProperty("readinessProbe")
-    private ClusterServiceVersionSpecISpecDSpecTSpecICReadinessProbe readinessProbe;
-    @JsonProperty("resizePolicy")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecICResizePolicy> resizePolicy = new ArrayList<>();
-    @JsonProperty("resources")
-    private ClusterServiceVersionSpecISpecDSpecTSpecICResources resources;
-    @JsonProperty("restartPolicy")
-    private String restartPolicy;
-    @JsonProperty("securityContext")
-    private ClusterServiceVersionSpecISpecDSpecTSpecICSecurityContext securityContext;
-    @JsonProperty("startupProbe")
-    private ClusterServiceVersionSpecISpecDSpecTSpecICStartupProbe startupProbe;
-    @JsonProperty("stdin")
-    private Boolean stdin;
-    @JsonProperty("stdinOnce")
-    private Boolean stdinOnce;
-    @JsonProperty("terminationMessagePath")
-    private String terminationMessagePath;
-    @JsonProperty("terminationMessagePolicy")
-    private String terminationMessagePolicy;
-    @JsonProperty("tty")
-    private Boolean tty;
-    @JsonProperty("volumeDevices")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<VolumeDevice> volumeDevices = new ArrayList<>();
-    @JsonProperty("volumeMounts")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecICVolumeMounts> volumeMounts = new ArrayList<>();
-    @JsonProperty("workingDir")
-    private String workingDir;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecInitContainers() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecInitContainers(List<String> args, List<String> command, List<ClusterServiceVersionSpecISpecDSpecTSpecICEnv> env, List<ClusterServiceVersionSpecISpecDSpecTSpecICEnvFrom> envFrom, String image, String imagePullPolicy, ClusterServiceVersionSpecISpecDSpecTSpecICLifecycle lifecycle, ClusterServiceVersionSpecISpecDSpecTSpecICLivenessProbe livenessProbe, String name, List<ClusterServiceVersionSpecISpecDSpecTSpecICPorts> ports, ClusterServiceVersionSpecISpecDSpecTSpecICReadinessProbe readinessProbe, List<ClusterServiceVersionSpecISpecDSpecTSpecICResizePolicy> resizePolicy, ClusterServiceVersionSpecISpecDSpecTSpecICResources resources, String restartPolicy, ClusterServiceVersionSpecISpecDSpecTSpecICSecurityContext securityContext, ClusterServiceVersionSpecISpecDSpecTSpecICStartupProbe startupProbe, Boolean stdin, Boolean stdinOnce, String terminationMessagePath, String terminationMessagePolicy, Boolean tty, List<VolumeDevice> volumeDevices, List<ClusterServiceVersionSpecISpecDSpecTSpecICVolumeMounts> volumeMounts, String workingDir) {
-        super();
-        this.args = args;
-        this.command = command;
-        this.env = env;
-        this.envFrom = envFrom;
-        this.image = image;
-        this.imagePullPolicy = imagePullPolicy;
-        this.lifecycle = lifecycle;
-        this.livenessProbe = livenessProbe;
-        this.name = name;
-        this.ports = ports;
-        this.readinessProbe = readinessProbe;
-        this.resizePolicy = resizePolicy;
-        this.resources = resources;
-        this.restartPolicy = restartPolicy;
-        this.securityContext = securityContext;
-        this.startupProbe = startupProbe;
-        this.stdin = stdin;
-        this.stdinOnce = stdinOnce;
-        this.terminationMessagePath = terminationMessagePath;
-        this.terminationMessagePolicy = terminationMessagePolicy;
-        this.tty = tty;
-        this.volumeDevices = volumeDevices;
-        this.volumeMounts = volumeMounts;
-        this.workingDir = workingDir;
-    }
-
-    @JsonProperty("args")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getArgs() {
-        return args;
-    }
-
-    @JsonProperty("args")
-    public void setArgs(List<String> args) {
-        this.args = args;
-    }
-
-    @JsonProperty("command")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getCommand() {
-        return command;
-    }
-
-    @JsonProperty("command")
-    public void setCommand(List<String> command) {
-        this.command = command;
-    }
-
-    @JsonProperty("env")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecICEnv> getEnv() {
-        return env;
-    }
-
-    @JsonProperty("env")
-    public void setEnv(List<ClusterServiceVersionSpecISpecDSpecTSpecICEnv> env) {
-        this.env = env;
-    }
-
-    @JsonProperty("envFrom")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecICEnvFrom> getEnvFrom() {
-        return envFrom;
-    }
-
-    @JsonProperty("envFrom")
-    public void setEnvFrom(List<ClusterServiceVersionSpecISpecDSpecTSpecICEnvFrom> envFrom) {
-        this.envFrom = envFrom;
-    }
-
-    @JsonProperty("image")
-    public String getImage() {
-        return image;
-    }
-
-    @JsonProperty("image")
-    public void setImage(String image) {
-        this.image = image;
-    }
-
-    @JsonProperty("imagePullPolicy")
-    public String getImagePullPolicy() {
-        return imagePullPolicy;
-    }
-
-    @JsonProperty("imagePullPolicy")
-    public void setImagePullPolicy(String imagePullPolicy) {
-        this.imagePullPolicy = imagePullPolicy;
-    }
-
-    @JsonProperty("lifecycle")
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLifecycle getLifecycle() {
-        return lifecycle;
-    }
-
-    @JsonProperty("lifecycle")
-    public void setLifecycle(ClusterServiceVersionSpecISpecDSpecTSpecICLifecycle lifecycle) {
-        this.lifecycle = lifecycle;
-    }
-
-    @JsonProperty("livenessProbe")
-    public ClusterServiceVersionSpecISpecDSpecTSpecICLivenessProbe getLivenessProbe() {
-        return livenessProbe;
-    }
-
-    @JsonProperty("livenessProbe")
-    public void setLivenessProbe(ClusterServiceVersionSpecISpecDSpecTSpecICLivenessProbe livenessProbe) {
-        this.livenessProbe = livenessProbe;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("ports")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecICPorts> getPorts() {
-        return ports;
-    }
-
-    @JsonProperty("ports")
-    public void setPorts(List<ClusterServiceVersionSpecISpecDSpecTSpecICPorts> ports) {
-        this.ports = ports;
-    }
-
-    @JsonProperty("readinessProbe")
-    public ClusterServiceVersionSpecISpecDSpecTSpecICReadinessProbe getReadinessProbe() {
-        return readinessProbe;
-    }
-
-    @JsonProperty("readinessProbe")
-    public void setReadinessProbe(ClusterServiceVersionSpecISpecDSpecTSpecICReadinessProbe readinessProbe) {
-        this.readinessProbe = readinessProbe;
-    }
-
-    @JsonProperty("resizePolicy")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecICResizePolicy> getResizePolicy() {
-        return resizePolicy;
-    }
-
-    @JsonProperty("resizePolicy")
-    public void setResizePolicy(List<ClusterServiceVersionSpecISpecDSpecTSpecICResizePolicy> resizePolicy) {
-        this.resizePolicy = resizePolicy;
-    }
-
-    @JsonProperty("resources")
-    public ClusterServiceVersionSpecISpecDSpecTSpecICResources getResources() {
-        return resources;
-    }
-
-    @JsonProperty("resources")
-    public void setResources(ClusterServiceVersionSpecISpecDSpecTSpecICResources resources) {
-        this.resources = resources;
-    }
-
-    @JsonProperty("restartPolicy")
-    public String getRestartPolicy() {
-        return restartPolicy;
-    }
-
-    @JsonProperty("restartPolicy")
-    public void setRestartPolicy(String restartPolicy) {
-        this.restartPolicy = restartPolicy;
-    }
-
-    @JsonProperty("securityContext")
-    public ClusterServiceVersionSpecISpecDSpecTSpecICSecurityContext getSecurityContext() {
-        return securityContext;
-    }
-
-    @JsonProperty("securityContext")
-    public void setSecurityContext(ClusterServiceVersionSpecISpecDSpecTSpecICSecurityContext securityContext) {
-        this.securityContext = securityContext;
-    }
-
-    @JsonProperty("startupProbe")
-    public ClusterServiceVersionSpecISpecDSpecTSpecICStartupProbe getStartupProbe() {
-        return startupProbe;
-    }
-
-    @JsonProperty("startupProbe")
-    public void setStartupProbe(ClusterServiceVersionSpecISpecDSpecTSpecICStartupProbe startupProbe) {
-        this.startupProbe = startupProbe;
-    }
-
-    @JsonProperty("stdin")
-    public Boolean getStdin() {
-        return stdin;
-    }
-
-    @JsonProperty("stdin")
-    public void setStdin(Boolean stdin) {
-        this.stdin = stdin;
-    }
-
-    @JsonProperty("stdinOnce")
-    public Boolean getStdinOnce() {
-        return stdinOnce;
-    }
-
-    @JsonProperty("stdinOnce")
-    public void setStdinOnce(Boolean stdinOnce) {
-        this.stdinOnce = stdinOnce;
-    }
-
-    @JsonProperty("terminationMessagePath")
-    public String getTerminationMessagePath() {
-        return terminationMessagePath;
-    }
-
-    @JsonProperty("terminationMessagePath")
-    public void setTerminationMessagePath(String terminationMessagePath) {
-        this.terminationMessagePath = terminationMessagePath;
-    }
-
-    @JsonProperty("terminationMessagePolicy")
-    public String getTerminationMessagePolicy() {
-        return terminationMessagePolicy;
-    }
-
-    @JsonProperty("terminationMessagePolicy")
-    public void setTerminationMessagePolicy(String terminationMessagePolicy) {
-        this.terminationMessagePolicy = terminationMessagePolicy;
-    }
-
-    @JsonProperty("tty")
-    public Boolean getTty() {
-        return tty;
-    }
-
-    @JsonProperty("tty")
-    public void setTty(Boolean tty) {
-        this.tty = tty;
-    }
-
-    @JsonProperty("volumeDevices")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<VolumeDevice> getVolumeDevices() {
-        return volumeDevices;
-    }
-
-    @JsonProperty("volumeDevices")
-    public void setVolumeDevices(List<VolumeDevice> volumeDevices) {
-        this.volumeDevices = volumeDevices;
-    }
-
-    @JsonProperty("volumeMounts")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecICVolumeMounts> getVolumeMounts() {
-        return volumeMounts;
-    }
-
-    @JsonProperty("volumeMounts")
-    public void setVolumeMounts(List<ClusterServiceVersionSpecISpecDSpecTSpecICVolumeMounts> volumeMounts) {
-        this.volumeMounts = volumeMounts;
-    }
-
-    @JsonProperty("workingDir")
-    public String getWorkingDir() {
-        return workingDir;
-    }
-
-    @JsonProperty("workingDir")
-    public void setWorkingDir(String workingDir) {
-        this.workingDir = workingDir;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecInitContainersBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecInitContainersBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecInitContainersBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecOs.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecOs.java
deleted file mode 100644
index 0dede584188..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecOs.java
+++ /dev/null
@@ -1,108 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecOs implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecOsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecOs() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecOs(String name) {
-        super();
-        this.name = name;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecOsBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecOsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecOsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecRCSource.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecRCSource.java
deleted file mode 100644
index 2e3509eb569..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecRCSource.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "resourceClaimName",
-    "resourceClaimTemplateName"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecRCSource implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecRCSourceBuilder> , KubernetesResource
-{
-
-    @JsonProperty("resourceClaimName")
-    private String resourceClaimName;
-    @JsonProperty("resourceClaimTemplateName")
-    private String resourceClaimTemplateName;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecRCSource() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecRCSource(String resourceClaimName, String resourceClaimTemplateName) {
-        super();
-        this.resourceClaimName = resourceClaimName;
-        this.resourceClaimTemplateName = resourceClaimTemplateName;
-    }
-
-    @JsonProperty("resourceClaimName")
-    public String getResourceClaimName() {
-        return resourceClaimName;
-    }
-
-    @JsonProperty("resourceClaimName")
-    public void setResourceClaimName(String resourceClaimName) {
-        this.resourceClaimName = resourceClaimName;
-    }
-
-    @JsonProperty("resourceClaimTemplateName")
-    public String getResourceClaimTemplateName() {
-        return resourceClaimTemplateName;
-    }
-
-    @JsonProperty("resourceClaimTemplateName")
-    public void setResourceClaimTemplateName(String resourceClaimTemplateName) {
-        this.resourceClaimTemplateName = resourceClaimTemplateName;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecRCSourceBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecRCSourceBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecRCSourceBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecResourceClaims.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecResourceClaims.java
deleted file mode 100644
index 81dde3c47cb..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecResourceClaims.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name",
-    "source"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecResourceClaims implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecResourceClaimsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("source")
-    private ClusterServiceVersionSpecISpecDSpecTSpecRCSource source;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecResourceClaims() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecResourceClaims(String name, ClusterServiceVersionSpecISpecDSpecTSpecRCSource source) {
-        super();
-        this.name = name;
-        this.source = source;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("source")
-    public ClusterServiceVersionSpecISpecDSpecTSpecRCSource getSource() {
-        return source;
-    }
-
-    @JsonProperty("source")
-    public void setSource(ClusterServiceVersionSpecISpecDSpecTSpecRCSource source) {
-        this.source = source;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecResourceClaimsBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecResourceClaimsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecResourceClaimsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecSCAppArmorProfile.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecSCAppArmorProfile.java
deleted file mode 100644
index 2b9d6db9907..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecSCAppArmorProfile.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "localhostProfile",
-    "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 ClusterServiceVersionSpecISpecDSpecTSpecSCAppArmorProfile implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecSCAppArmorProfileBuilder> , KubernetesResource
-{
-
-    @JsonProperty("localhostProfile")
-    private String localhostProfile;
-    @JsonProperty("type")
-    private String type;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecSCAppArmorProfile() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecSCAppArmorProfile(String localhostProfile, String type) {
-        super();
-        this.localhostProfile = localhostProfile;
-        this.type = type;
-    }
-
-    @JsonProperty("localhostProfile")
-    public String getLocalhostProfile() {
-        return localhostProfile;
-    }
-
-    @JsonProperty("localhostProfile")
-    public void setLocalhostProfile(String localhostProfile) {
-        this.localhostProfile = localhostProfile;
-    }
-
-    @JsonProperty("type")
-    public String getType() {
-        return type;
-    }
-
-    @JsonProperty("type")
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecSCAppArmorProfileBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecSCAppArmorProfileBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecSCAppArmorProfileBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecSCSeLinuxOptions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecSCSeLinuxOptions.java
deleted file mode 100644
index 6af47166b7d..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecSCSeLinuxOptions.java
+++ /dev/null
@@ -1,150 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "level",
-    "role",
-    "type",
-    "user"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecSCSeLinuxOptions implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecSCSeLinuxOptionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("level")
-    private String level;
-    @JsonProperty("role")
-    private String role;
-    @JsonProperty("type")
-    private String type;
-    @JsonProperty("user")
-    private String user;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecSCSeLinuxOptions() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecSCSeLinuxOptions(String level, String role, String type, String user) {
-        super();
-        this.level = level;
-        this.role = role;
-        this.type = type;
-        this.user = user;
-    }
-
-    @JsonProperty("level")
-    public String getLevel() {
-        return level;
-    }
-
-    @JsonProperty("level")
-    public void setLevel(String level) {
-        this.level = level;
-    }
-
-    @JsonProperty("role")
-    public String getRole() {
-        return role;
-    }
-
-    @JsonProperty("role")
-    public void setRole(String role) {
-        this.role = role;
-    }
-
-    @JsonProperty("type")
-    public String getType() {
-        return type;
-    }
-
-    @JsonProperty("type")
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    @JsonProperty("user")
-    public String getUser() {
-        return user;
-    }
-
-    @JsonProperty("user")
-    public void setUser(String user) {
-        this.user = user;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecSCSeLinuxOptionsBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecSCSeLinuxOptionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecSCSeLinuxOptionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecSCSeccompProfile.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecSCSeccompProfile.java
deleted file mode 100644
index 49d0e8b7e8d..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecSCSeccompProfile.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "localhostProfile",
-    "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 ClusterServiceVersionSpecISpecDSpecTSpecSCSeccompProfile implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecSCSeccompProfileBuilder> , KubernetesResource
-{
-
-    @JsonProperty("localhostProfile")
-    private String localhostProfile;
-    @JsonProperty("type")
-    private String type;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecSCSeccompProfile() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecSCSeccompProfile(String localhostProfile, String type) {
-        super();
-        this.localhostProfile = localhostProfile;
-        this.type = type;
-    }
-
-    @JsonProperty("localhostProfile")
-    public String getLocalhostProfile() {
-        return localhostProfile;
-    }
-
-    @JsonProperty("localhostProfile")
-    public void setLocalhostProfile(String localhostProfile) {
-        this.localhostProfile = localhostProfile;
-    }
-
-    @JsonProperty("type")
-    public String getType() {
-        return type;
-    }
-
-    @JsonProperty("type")
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecSCSeccompProfileBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecSCSeccompProfileBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecSCSeccompProfileBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecSCWindowsOptions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecSCWindowsOptions.java
deleted file mode 100644
index bd747dd901e..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecSCWindowsOptions.java
+++ /dev/null
@@ -1,150 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "gmsaCredentialSpec",
-    "gmsaCredentialSpecName",
-    "hostProcess",
-    "runAsUserName"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecSCWindowsOptions implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecSCWindowsOptionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("gmsaCredentialSpec")
-    private String gmsaCredentialSpec;
-    @JsonProperty("gmsaCredentialSpecName")
-    private String gmsaCredentialSpecName;
-    @JsonProperty("hostProcess")
-    private Boolean hostProcess;
-    @JsonProperty("runAsUserName")
-    private String runAsUserName;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecSCWindowsOptions() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecSCWindowsOptions(String gmsaCredentialSpec, String gmsaCredentialSpecName, Boolean hostProcess, String runAsUserName) {
-        super();
-        this.gmsaCredentialSpec = gmsaCredentialSpec;
-        this.gmsaCredentialSpecName = gmsaCredentialSpecName;
-        this.hostProcess = hostProcess;
-        this.runAsUserName = runAsUserName;
-    }
-
-    @JsonProperty("gmsaCredentialSpec")
-    public String getGmsaCredentialSpec() {
-        return gmsaCredentialSpec;
-    }
-
-    @JsonProperty("gmsaCredentialSpec")
-    public void setGmsaCredentialSpec(String gmsaCredentialSpec) {
-        this.gmsaCredentialSpec = gmsaCredentialSpec;
-    }
-
-    @JsonProperty("gmsaCredentialSpecName")
-    public String getGmsaCredentialSpecName() {
-        return gmsaCredentialSpecName;
-    }
-
-    @JsonProperty("gmsaCredentialSpecName")
-    public void setGmsaCredentialSpecName(String gmsaCredentialSpecName) {
-        this.gmsaCredentialSpecName = gmsaCredentialSpecName;
-    }
-
-    @JsonProperty("hostProcess")
-    public Boolean getHostProcess() {
-        return hostProcess;
-    }
-
-    @JsonProperty("hostProcess")
-    public void setHostProcess(Boolean hostProcess) {
-        this.hostProcess = hostProcess;
-    }
-
-    @JsonProperty("runAsUserName")
-    public String getRunAsUserName() {
-        return runAsUserName;
-    }
-
-    @JsonProperty("runAsUserName")
-    public void setRunAsUserName(String runAsUserName) {
-        this.runAsUserName = runAsUserName;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecSCWindowsOptionsBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecSCWindowsOptionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecSCWindowsOptionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecSchedulingGates.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecSchedulingGates.java
deleted file mode 100644
index 11c80014521..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecSchedulingGates.java
+++ /dev/null
@@ -1,108 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecSchedulingGates implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecSchedulingGatesBuilder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecSchedulingGates() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecSchedulingGates(String name) {
-        super();
-        this.name = name;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecSchedulingGatesBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecSchedulingGatesBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecSchedulingGatesBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecSecurityContext.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecSecurityContext.java
deleted file mode 100644
index 3203c99c759..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecSecurityContext.java
+++ /dev/null
@@ -1,255 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.fabric8.kubernetes.api.model.Sysctl;
-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({
-    "appArmorProfile",
-    "fsGroup",
-    "fsGroupChangePolicy",
-    "runAsGroup",
-    "runAsNonRoot",
-    "runAsUser",
-    "seLinuxOptions",
-    "seccompProfile",
-    "supplementalGroups",
-    "sysctls",
-    "windowsOptions"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecSecurityContext implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecSecurityContextBuilder> , KubernetesResource
-{
-
-    @JsonProperty("appArmorProfile")
-    private ClusterServiceVersionSpecISpecDSpecTSpecSCAppArmorProfile appArmorProfile;
-    @JsonProperty("fsGroup")
-    private Long fsGroup;
-    @JsonProperty("fsGroupChangePolicy")
-    private String fsGroupChangePolicy;
-    @JsonProperty("runAsGroup")
-    private Long runAsGroup;
-    @JsonProperty("runAsNonRoot")
-    private Boolean runAsNonRoot;
-    @JsonProperty("runAsUser")
-    private Long runAsUser;
-    @JsonProperty("seLinuxOptions")
-    private ClusterServiceVersionSpecISpecDSpecTSpecSCSeLinuxOptions seLinuxOptions;
-    @JsonProperty("seccompProfile")
-    private ClusterServiceVersionSpecISpecDSpecTSpecSCSeccompProfile seccompProfile;
-    @JsonProperty("supplementalGroups")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<Long> supplementalGroups = new ArrayList<>();
-    @JsonProperty("sysctls")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<Sysctl> sysctls = new ArrayList<>();
-    @JsonProperty("windowsOptions")
-    private ClusterServiceVersionSpecISpecDSpecTSpecSCWindowsOptions windowsOptions;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecSecurityContext() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecSecurityContext(ClusterServiceVersionSpecISpecDSpecTSpecSCAppArmorProfile appArmorProfile, Long fsGroup, String fsGroupChangePolicy, Long runAsGroup, Boolean runAsNonRoot, Long runAsUser, ClusterServiceVersionSpecISpecDSpecTSpecSCSeLinuxOptions seLinuxOptions, ClusterServiceVersionSpecISpecDSpecTSpecSCSeccompProfile seccompProfile, List<Long> supplementalGroups, List<Sysctl> sysctls, ClusterServiceVersionSpecISpecDSpecTSpecSCWindowsOptions windowsOptions) {
-        super();
-        this.appArmorProfile = appArmorProfile;
-        this.fsGroup = fsGroup;
-        this.fsGroupChangePolicy = fsGroupChangePolicy;
-        this.runAsGroup = runAsGroup;
-        this.runAsNonRoot = runAsNonRoot;
-        this.runAsUser = runAsUser;
-        this.seLinuxOptions = seLinuxOptions;
-        this.seccompProfile = seccompProfile;
-        this.supplementalGroups = supplementalGroups;
-        this.sysctls = sysctls;
-        this.windowsOptions = windowsOptions;
-    }
-
-    @JsonProperty("appArmorProfile")
-    public ClusterServiceVersionSpecISpecDSpecTSpecSCAppArmorProfile getAppArmorProfile() {
-        return appArmorProfile;
-    }
-
-    @JsonProperty("appArmorProfile")
-    public void setAppArmorProfile(ClusterServiceVersionSpecISpecDSpecTSpecSCAppArmorProfile appArmorProfile) {
-        this.appArmorProfile = appArmorProfile;
-    }
-
-    @JsonProperty("fsGroup")
-    public Long getFsGroup() {
-        return fsGroup;
-    }
-
-    @JsonProperty("fsGroup")
-    public void setFsGroup(Long fsGroup) {
-        this.fsGroup = fsGroup;
-    }
-
-    @JsonProperty("fsGroupChangePolicy")
-    public String getFsGroupChangePolicy() {
-        return fsGroupChangePolicy;
-    }
-
-    @JsonProperty("fsGroupChangePolicy")
-    public void setFsGroupChangePolicy(String fsGroupChangePolicy) {
-        this.fsGroupChangePolicy = fsGroupChangePolicy;
-    }
-
-    @JsonProperty("runAsGroup")
-    public Long getRunAsGroup() {
-        return runAsGroup;
-    }
-
-    @JsonProperty("runAsGroup")
-    public void setRunAsGroup(Long runAsGroup) {
-        this.runAsGroup = runAsGroup;
-    }
-
-    @JsonProperty("runAsNonRoot")
-    public Boolean getRunAsNonRoot() {
-        return runAsNonRoot;
-    }
-
-    @JsonProperty("runAsNonRoot")
-    public void setRunAsNonRoot(Boolean runAsNonRoot) {
-        this.runAsNonRoot = runAsNonRoot;
-    }
-
-    @JsonProperty("runAsUser")
-    public Long getRunAsUser() {
-        return runAsUser;
-    }
-
-    @JsonProperty("runAsUser")
-    public void setRunAsUser(Long runAsUser) {
-        this.runAsUser = runAsUser;
-    }
-
-    @JsonProperty("seLinuxOptions")
-    public ClusterServiceVersionSpecISpecDSpecTSpecSCSeLinuxOptions getSeLinuxOptions() {
-        return seLinuxOptions;
-    }
-
-    @JsonProperty("seLinuxOptions")
-    public void setSeLinuxOptions(ClusterServiceVersionSpecISpecDSpecTSpecSCSeLinuxOptions seLinuxOptions) {
-        this.seLinuxOptions = seLinuxOptions;
-    }
-
-    @JsonProperty("seccompProfile")
-    public ClusterServiceVersionSpecISpecDSpecTSpecSCSeccompProfile getSeccompProfile() {
-        return seccompProfile;
-    }
-
-    @JsonProperty("seccompProfile")
-    public void setSeccompProfile(ClusterServiceVersionSpecISpecDSpecTSpecSCSeccompProfile seccompProfile) {
-        this.seccompProfile = seccompProfile;
-    }
-
-    @JsonProperty("supplementalGroups")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<Long> getSupplementalGroups() {
-        return supplementalGroups;
-    }
-
-    @JsonProperty("supplementalGroups")
-    public void setSupplementalGroups(List<Long> supplementalGroups) {
-        this.supplementalGroups = supplementalGroups;
-    }
-
-    @JsonProperty("sysctls")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<Sysctl> getSysctls() {
-        return sysctls;
-    }
-
-    @JsonProperty("sysctls")
-    public void setSysctls(List<Sysctl> sysctls) {
-        this.sysctls = sysctls;
-    }
-
-    @JsonProperty("windowsOptions")
-    public ClusterServiceVersionSpecISpecDSpecTSpecSCWindowsOptions getWindowsOptions() {
-        return windowsOptions;
-    }
-
-    @JsonProperty("windowsOptions")
-    public void setWindowsOptions(ClusterServiceVersionSpecISpecDSpecTSpecSCWindowsOptions windowsOptions) {
-        this.windowsOptions = windowsOptions;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecSecurityContextBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecSecurityContextBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecSecurityContextBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecTSCLSMatchExpressions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecTSCLSMatchExpressions.java
deleted file mode 100644
index e462d09a93f..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecTSCLSMatchExpressions.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "operator",
-    "values"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecTSCLSMatchExpressions implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecTSCLSMatchExpressionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("operator")
-    private String operator;
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> values = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecTSCLSMatchExpressions() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecTSCLSMatchExpressions(String key, String operator, List<String> values) {
-        super();
-        this.key = key;
-        this.operator = operator;
-        this.values = values;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("operator")
-    public String getOperator() {
-        return operator;
-    }
-
-    @JsonProperty("operator")
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getValues() {
-        return values;
-    }
-
-    @JsonProperty("values")
-    public void setValues(List<String> values) {
-        this.values = values;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecTSCLSMatchExpressionsBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecTSCLSMatchExpressionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecTSCLSMatchExpressionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecTSCLabelSelector.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecTSCLabelSelector.java
deleted file mode 100644
index d77e96cd7ee..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecTSCLabelSelector.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "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 ClusterServiceVersionSpecISpecDSpecTSpecTSCLabelSelector implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecTSCLabelSelectorBuilder> , KubernetesResource
-{
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecTSCLSMatchExpressions> matchExpressions = new ArrayList<>();
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, String> matchLabels = new LinkedHashMap<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecTSCLabelSelector() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecTSCLabelSelector(List<ClusterServiceVersionSpecISpecDSpecTSpecTSCLSMatchExpressions> matchExpressions, Map<String, String> matchLabels) {
-        super();
-        this.matchExpressions = matchExpressions;
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecTSCLSMatchExpressions> getMatchExpressions() {
-        return matchExpressions;
-    }
-
-    @JsonProperty("matchExpressions")
-    public void setMatchExpressions(List<ClusterServiceVersionSpecISpecDSpecTSpecTSCLSMatchExpressions> matchExpressions) {
-        this.matchExpressions = matchExpressions;
-    }
-
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, String> getMatchLabels() {
-        return matchLabels;
-    }
-
-    @JsonProperty("matchLabels")
-    public void setMatchLabels(Map<String, String> matchLabels) {
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecTSCLabelSelectorBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecTSCLabelSelectorBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecTSCLabelSelectorBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecTolerations.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecTolerations.java
deleted file mode 100644
index dedbc45baba..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecTolerations.java
+++ /dev/null
@@ -1,164 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "effect",
-    "key",
-    "operator",
-    "tolerationSeconds",
-    "value"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecTolerations implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecTolerationsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("effect")
-    private String effect;
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("operator")
-    private String operator;
-    @JsonProperty("tolerationSeconds")
-    private Long tolerationSeconds;
-    @JsonProperty("value")
-    private String value;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecTolerations() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecTolerations(String effect, String key, String operator, Long tolerationSeconds, String value) {
-        super();
-        this.effect = effect;
-        this.key = key;
-        this.operator = operator;
-        this.tolerationSeconds = tolerationSeconds;
-        this.value = value;
-    }
-
-    @JsonProperty("effect")
-    public String getEffect() {
-        return effect;
-    }
-
-    @JsonProperty("effect")
-    public void setEffect(String effect) {
-        this.effect = effect;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("operator")
-    public String getOperator() {
-        return operator;
-    }
-
-    @JsonProperty("operator")
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    @JsonProperty("tolerationSeconds")
-    public Long getTolerationSeconds() {
-        return tolerationSeconds;
-    }
-
-    @JsonProperty("tolerationSeconds")
-    public void setTolerationSeconds(Long tolerationSeconds) {
-        this.tolerationSeconds = tolerationSeconds;
-    }
-
-    @JsonProperty("value")
-    public String getValue() {
-        return value;
-    }
-
-    @JsonProperty("value")
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecTolerationsBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecTolerationsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecTolerationsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecTopologySpreadConstraints.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecTopologySpreadConstraints.java
deleted file mode 100644
index ee466f9002e..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecTopologySpreadConstraints.java
+++ /dev/null
@@ -1,210 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "labelSelector",
-    "matchLabelKeys",
-    "maxSkew",
-    "minDomains",
-    "nodeAffinityPolicy",
-    "nodeTaintsPolicy",
-    "topologyKey",
-    "whenUnsatisfiable"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecTopologySpreadConstraints implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecTopologySpreadConstraintsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("labelSelector")
-    private ClusterServiceVersionSpecISpecDSpecTSpecTSCLabelSelector labelSelector;
-    @JsonProperty("matchLabelKeys")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> matchLabelKeys = new ArrayList<>();
-    @JsonProperty("maxSkew")
-    private Integer maxSkew;
-    @JsonProperty("minDomains")
-    private Integer minDomains;
-    @JsonProperty("nodeAffinityPolicy")
-    private String nodeAffinityPolicy;
-    @JsonProperty("nodeTaintsPolicy")
-    private String nodeTaintsPolicy;
-    @JsonProperty("topologyKey")
-    private String topologyKey;
-    @JsonProperty("whenUnsatisfiable")
-    private String whenUnsatisfiable;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecTopologySpreadConstraints() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecTopologySpreadConstraints(ClusterServiceVersionSpecISpecDSpecTSpecTSCLabelSelector labelSelector, List<String> matchLabelKeys, Integer maxSkew, Integer minDomains, String nodeAffinityPolicy, String nodeTaintsPolicy, String topologyKey, String whenUnsatisfiable) {
-        super();
-        this.labelSelector = labelSelector;
-        this.matchLabelKeys = matchLabelKeys;
-        this.maxSkew = maxSkew;
-        this.minDomains = minDomains;
-        this.nodeAffinityPolicy = nodeAffinityPolicy;
-        this.nodeTaintsPolicy = nodeTaintsPolicy;
-        this.topologyKey = topologyKey;
-        this.whenUnsatisfiable = whenUnsatisfiable;
-    }
-
-    @JsonProperty("labelSelector")
-    public ClusterServiceVersionSpecISpecDSpecTSpecTSCLabelSelector getLabelSelector() {
-        return labelSelector;
-    }
-
-    @JsonProperty("labelSelector")
-    public void setLabelSelector(ClusterServiceVersionSpecISpecDSpecTSpecTSCLabelSelector labelSelector) {
-        this.labelSelector = labelSelector;
-    }
-
-    @JsonProperty("matchLabelKeys")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getMatchLabelKeys() {
-        return matchLabelKeys;
-    }
-
-    @JsonProperty("matchLabelKeys")
-    public void setMatchLabelKeys(List<String> matchLabelKeys) {
-        this.matchLabelKeys = matchLabelKeys;
-    }
-
-    @JsonProperty("maxSkew")
-    public Integer getMaxSkew() {
-        return maxSkew;
-    }
-
-    @JsonProperty("maxSkew")
-    public void setMaxSkew(Integer maxSkew) {
-        this.maxSkew = maxSkew;
-    }
-
-    @JsonProperty("minDomains")
-    public Integer getMinDomains() {
-        return minDomains;
-    }
-
-    @JsonProperty("minDomains")
-    public void setMinDomains(Integer minDomains) {
-        this.minDomains = minDomains;
-    }
-
-    @JsonProperty("nodeAffinityPolicy")
-    public String getNodeAffinityPolicy() {
-        return nodeAffinityPolicy;
-    }
-
-    @JsonProperty("nodeAffinityPolicy")
-    public void setNodeAffinityPolicy(String nodeAffinityPolicy) {
-        this.nodeAffinityPolicy = nodeAffinityPolicy;
-    }
-
-    @JsonProperty("nodeTaintsPolicy")
-    public String getNodeTaintsPolicy() {
-        return nodeTaintsPolicy;
-    }
-
-    @JsonProperty("nodeTaintsPolicy")
-    public void setNodeTaintsPolicy(String nodeTaintsPolicy) {
-        this.nodeTaintsPolicy = nodeTaintsPolicy;
-    }
-
-    @JsonProperty("topologyKey")
-    public String getTopologyKey() {
-        return topologyKey;
-    }
-
-    @JsonProperty("topologyKey")
-    public void setTopologyKey(String topologyKey) {
-        this.topologyKey = topologyKey;
-    }
-
-    @JsonProperty("whenUnsatisfiable")
-    public String getWhenUnsatisfiable() {
-        return whenUnsatisfiable;
-    }
-
-    @JsonProperty("whenUnsatisfiable")
-    public void setWhenUnsatisfiable(String whenUnsatisfiable) {
-        this.whenUnsatisfiable = whenUnsatisfiable;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecTopologySpreadConstraintsBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecTopologySpreadConstraintsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecTopologySpreadConstraintsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVAwsElasticBlockStore.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVAwsElasticBlockStore.java
deleted file mode 100644
index 61863a6ee70..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVAwsElasticBlockStore.java
+++ /dev/null
@@ -1,150 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "fsType",
-    "partition",
-    "readOnly",
-    "volumeID"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVAwsElasticBlockStore implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVAwsElasticBlockStoreBuilder> , KubernetesResource
-{
-
-    @JsonProperty("fsType")
-    private String fsType;
-    @JsonProperty("partition")
-    private Integer partition;
-    @JsonProperty("readOnly")
-    private Boolean readOnly;
-    @JsonProperty("volumeID")
-    private String volumeID;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVAwsElasticBlockStore() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVAwsElasticBlockStore(String fsType, Integer partition, Boolean readOnly, String volumeID) {
-        super();
-        this.fsType = fsType;
-        this.partition = partition;
-        this.readOnly = readOnly;
-        this.volumeID = volumeID;
-    }
-
-    @JsonProperty("fsType")
-    public String getFsType() {
-        return fsType;
-    }
-
-    @JsonProperty("fsType")
-    public void setFsType(String fsType) {
-        this.fsType = fsType;
-    }
-
-    @JsonProperty("partition")
-    public Integer getPartition() {
-        return partition;
-    }
-
-    @JsonProperty("partition")
-    public void setPartition(Integer partition) {
-        this.partition = partition;
-    }
-
-    @JsonProperty("readOnly")
-    public Boolean getReadOnly() {
-        return readOnly;
-    }
-
-    @JsonProperty("readOnly")
-    public void setReadOnly(Boolean readOnly) {
-        this.readOnly = readOnly;
-    }
-
-    @JsonProperty("volumeID")
-    public String getVolumeID() {
-        return volumeID;
-    }
-
-    @JsonProperty("volumeID")
-    public void setVolumeID(String volumeID) {
-        this.volumeID = volumeID;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVAwsElasticBlockStoreBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVAwsElasticBlockStoreBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVAwsElasticBlockStoreBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVAzureDisk.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVAzureDisk.java
deleted file mode 100644
index 9fd7fb1640e..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVAzureDisk.java
+++ /dev/null
@@ -1,178 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "kind",
-    "cachingMode",
-    "diskName",
-    "diskURI",
-    "fsType",
-    "readOnly"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVAzureDisk implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVAzureDiskBuilder> , KubernetesResource
-{
-
-    @JsonProperty("cachingMode")
-    private String cachingMode;
-    @JsonProperty("diskName")
-    private String diskName;
-    @JsonProperty("diskURI")
-    private String diskURI;
-    @JsonProperty("fsType")
-    private String fsType;
-    @JsonProperty("kind")
-    private String kind;
-    @JsonProperty("readOnly")
-    private Boolean readOnly;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVAzureDisk() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVAzureDisk(String cachingMode, String diskName, String diskURI, String fsType, String kind, Boolean readOnly) {
-        super();
-        this.cachingMode = cachingMode;
-        this.diskName = diskName;
-        this.diskURI = diskURI;
-        this.fsType = fsType;
-        this.kind = kind;
-        this.readOnly = readOnly;
-    }
-
-    @JsonProperty("cachingMode")
-    public String getCachingMode() {
-        return cachingMode;
-    }
-
-    @JsonProperty("cachingMode")
-    public void setCachingMode(String cachingMode) {
-        this.cachingMode = cachingMode;
-    }
-
-    @JsonProperty("diskName")
-    public String getDiskName() {
-        return diskName;
-    }
-
-    @JsonProperty("diskName")
-    public void setDiskName(String diskName) {
-        this.diskName = diskName;
-    }
-
-    @JsonProperty("diskURI")
-    public String getDiskURI() {
-        return diskURI;
-    }
-
-    @JsonProperty("diskURI")
-    public void setDiskURI(String diskURI) {
-        this.diskURI = diskURI;
-    }
-
-    @JsonProperty("fsType")
-    public String getFsType() {
-        return fsType;
-    }
-
-    @JsonProperty("fsType")
-    public void setFsType(String fsType) {
-        this.fsType = fsType;
-    }
-
-    @JsonProperty("kind")
-    public String getKind() {
-        return kind;
-    }
-
-    @JsonProperty("kind")
-    public void setKind(String kind) {
-        this.kind = kind;
-    }
-
-    @JsonProperty("readOnly")
-    public Boolean getReadOnly() {
-        return readOnly;
-    }
-
-    @JsonProperty("readOnly")
-    public void setReadOnly(Boolean readOnly) {
-        this.readOnly = readOnly;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVAzureDiskBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVAzureDiskBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVAzureDiskBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVAzureFile.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVAzureFile.java
deleted file mode 100644
index a4a7825f519..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVAzureFile.java
+++ /dev/null
@@ -1,136 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "readOnly",
-    "secretName",
-    "shareName"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVAzureFile implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVAzureFileBuilder> , KubernetesResource
-{
-
-    @JsonProperty("readOnly")
-    private Boolean readOnly;
-    @JsonProperty("secretName")
-    private String secretName;
-    @JsonProperty("shareName")
-    private String shareName;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVAzureFile() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVAzureFile(Boolean readOnly, String secretName, String shareName) {
-        super();
-        this.readOnly = readOnly;
-        this.secretName = secretName;
-        this.shareName = shareName;
-    }
-
-    @JsonProperty("readOnly")
-    public Boolean getReadOnly() {
-        return readOnly;
-    }
-
-    @JsonProperty("readOnly")
-    public void setReadOnly(Boolean readOnly) {
-        this.readOnly = readOnly;
-    }
-
-    @JsonProperty("secretName")
-    public String getSecretName() {
-        return secretName;
-    }
-
-    @JsonProperty("secretName")
-    public void setSecretName(String secretName) {
-        this.secretName = secretName;
-    }
-
-    @JsonProperty("shareName")
-    public String getShareName() {
-        return shareName;
-    }
-
-    @JsonProperty("shareName")
-    public void setShareName(String shareName) {
-        this.shareName = shareName;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVAzureFileBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVAzureFileBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVAzureFileBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVCMItems.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVCMItems.java
deleted file mode 100644
index 4dd892887f4..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVCMItems.java
+++ /dev/null
@@ -1,136 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "mode",
-    "path"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVCMItems implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVCMItemsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("mode")
-    private Integer mode;
-    @JsonProperty("path")
-    private String path;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVCMItems() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVCMItems(String key, Integer mode, String path) {
-        super();
-        this.key = key;
-        this.mode = mode;
-        this.path = path;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("mode")
-    public Integer getMode() {
-        return mode;
-    }
-
-    @JsonProperty("mode")
-    public void setMode(Integer mode) {
-        this.mode = mode;
-    }
-
-    @JsonProperty("path")
-    public String getPath() {
-        return path;
-    }
-
-    @JsonProperty("path")
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVCMItemsBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVCMItemsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVCMItemsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVCNodePublishSecretRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVCNodePublishSecretRef.java
deleted file mode 100644
index d331a630d09..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVCNodePublishSecretRef.java
+++ /dev/null
@@ -1,108 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVCNodePublishSecretRef implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVCNodePublishSecretRefBuilder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVCNodePublishSecretRef() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVCNodePublishSecretRef(String name) {
-        super();
-        this.name = name;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVCNodePublishSecretRefBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVCNodePublishSecretRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVCNodePublishSecretRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVCSecretRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVCSecretRef.java
deleted file mode 100644
index fc5e3b56f7d..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVCSecretRef.java
+++ /dev/null
@@ -1,108 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVCSecretRef implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVCSecretRefBuilder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVCSecretRef() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVCSecretRef(String name) {
-        super();
-        this.name = name;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVCSecretRefBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVCSecretRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVCSecretRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVCSecretRef_1.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVCSecretRef_1.java
deleted file mode 100644
index 07400c82a20..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVCSecretRef_1.java
+++ /dev/null
@@ -1,108 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVCSecretRef_1 implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVCSecretRef_1Builder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVCSecretRef_1() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVCSecretRef_1(String name) {
-        super();
-        this.name = name;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVCSecretRef_1Builder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVCSecretRef_1Builder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVCSecretRef_1Builder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVCephfs.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVCephfs.java
deleted file mode 100644
index 786f7b573b8..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVCephfs.java
+++ /dev/null
@@ -1,182 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "monitors",
-    "path",
-    "readOnly",
-    "secretFile",
-    "secretRef",
-    "user"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVCephfs implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVCephfsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("monitors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> monitors = new ArrayList<>();
-    @JsonProperty("path")
-    private String path;
-    @JsonProperty("readOnly")
-    private Boolean readOnly;
-    @JsonProperty("secretFile")
-    private String secretFile;
-    @JsonProperty("secretRef")
-    private ClusterServiceVersionSpecISpecDSpecTSpecVCSecretRef secretRef;
-    @JsonProperty("user")
-    private String user;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVCephfs() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVCephfs(List<String> monitors, String path, Boolean readOnly, String secretFile, ClusterServiceVersionSpecISpecDSpecTSpecVCSecretRef secretRef, String user) {
-        super();
-        this.monitors = monitors;
-        this.path = path;
-        this.readOnly = readOnly;
-        this.secretFile = secretFile;
-        this.secretRef = secretRef;
-        this.user = user;
-    }
-
-    @JsonProperty("monitors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getMonitors() {
-        return monitors;
-    }
-
-    @JsonProperty("monitors")
-    public void setMonitors(List<String> monitors) {
-        this.monitors = monitors;
-    }
-
-    @JsonProperty("path")
-    public String getPath() {
-        return path;
-    }
-
-    @JsonProperty("path")
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @JsonProperty("readOnly")
-    public Boolean getReadOnly() {
-        return readOnly;
-    }
-
-    @JsonProperty("readOnly")
-    public void setReadOnly(Boolean readOnly) {
-        this.readOnly = readOnly;
-    }
-
-    @JsonProperty("secretFile")
-    public String getSecretFile() {
-        return secretFile;
-    }
-
-    @JsonProperty("secretFile")
-    public void setSecretFile(String secretFile) {
-        this.secretFile = secretFile;
-    }
-
-    @JsonProperty("secretRef")
-    public ClusterServiceVersionSpecISpecDSpecTSpecVCSecretRef getSecretRef() {
-        return secretRef;
-    }
-
-    @JsonProperty("secretRef")
-    public void setSecretRef(ClusterServiceVersionSpecISpecDSpecTSpecVCSecretRef secretRef) {
-        this.secretRef = secretRef;
-    }
-
-    @JsonProperty("user")
-    public String getUser() {
-        return user;
-    }
-
-    @JsonProperty("user")
-    public void setUser(String user) {
-        this.user = user;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVCephfsBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVCephfsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVCephfsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVCinder.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVCinder.java
deleted file mode 100644
index 027ca0eed67..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVCinder.java
+++ /dev/null
@@ -1,150 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "fsType",
-    "readOnly",
-    "secretRef",
-    "volumeID"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVCinder implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVCinderBuilder> , KubernetesResource
-{
-
-    @JsonProperty("fsType")
-    private String fsType;
-    @JsonProperty("readOnly")
-    private Boolean readOnly;
-    @JsonProperty("secretRef")
-    private ClusterServiceVersionSpecISpecDSpecTSpecVCSecretRef_1 secretRef;
-    @JsonProperty("volumeID")
-    private String volumeID;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVCinder() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVCinder(String fsType, Boolean readOnly, ClusterServiceVersionSpecISpecDSpecTSpecVCSecretRef_1 secretRef, String volumeID) {
-        super();
-        this.fsType = fsType;
-        this.readOnly = readOnly;
-        this.secretRef = secretRef;
-        this.volumeID = volumeID;
-    }
-
-    @JsonProperty("fsType")
-    public String getFsType() {
-        return fsType;
-    }
-
-    @JsonProperty("fsType")
-    public void setFsType(String fsType) {
-        this.fsType = fsType;
-    }
-
-    @JsonProperty("readOnly")
-    public Boolean getReadOnly() {
-        return readOnly;
-    }
-
-    @JsonProperty("readOnly")
-    public void setReadOnly(Boolean readOnly) {
-        this.readOnly = readOnly;
-    }
-
-    @JsonProperty("secretRef")
-    public ClusterServiceVersionSpecISpecDSpecTSpecVCSecretRef_1 getSecretRef() {
-        return secretRef;
-    }
-
-    @JsonProperty("secretRef")
-    public void setSecretRef(ClusterServiceVersionSpecISpecDSpecTSpecVCSecretRef_1 secretRef) {
-        this.secretRef = secretRef;
-    }
-
-    @JsonProperty("volumeID")
-    public String getVolumeID() {
-        return volumeID;
-    }
-
-    @JsonProperty("volumeID")
-    public void setVolumeID(String volumeID) {
-        this.volumeID = volumeID;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVCinderBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVCinderBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVCinderBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVConfigMap.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVConfigMap.java
deleted file mode 100644
index f87ca11c49b..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVConfigMap.java
+++ /dev/null
@@ -1,154 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "defaultMode",
-    "items",
-    "name",
-    "optional"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVConfigMap implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVConfigMapBuilder> , KubernetesResource
-{
-
-    @JsonProperty("defaultMode")
-    private Integer defaultMode;
-    @JsonProperty("items")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecVCMItems> items = new ArrayList<>();
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("optional")
-    private Boolean optional;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVConfigMap() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVConfigMap(Integer defaultMode, List<ClusterServiceVersionSpecISpecDSpecTSpecVCMItems> items, String name, Boolean optional) {
-        super();
-        this.defaultMode = defaultMode;
-        this.items = items;
-        this.name = name;
-        this.optional = optional;
-    }
-
-    @JsonProperty("defaultMode")
-    public Integer getDefaultMode() {
-        return defaultMode;
-    }
-
-    @JsonProperty("defaultMode")
-    public void setDefaultMode(Integer defaultMode) {
-        this.defaultMode = defaultMode;
-    }
-
-    @JsonProperty("items")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecVCMItems> getItems() {
-        return items;
-    }
-
-    @JsonProperty("items")
-    public void setItems(List<ClusterServiceVersionSpecISpecDSpecTSpecVCMItems> items) {
-        this.items = items;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("optional")
-    public Boolean getOptional() {
-        return optional;
-    }
-
-    @JsonProperty("optional")
-    public void setOptional(Boolean optional) {
-        this.optional = optional;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVConfigMapBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVConfigMapBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVConfigMapBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVCsi.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVCsi.java
deleted file mode 100644
index 81f7fc27953..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVCsi.java
+++ /dev/null
@@ -1,166 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "driver",
-    "fsType",
-    "nodePublishSecretRef",
-    "readOnly",
-    "volumeAttributes"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVCsi implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVCsiBuilder> , KubernetesResource
-{
-
-    @JsonProperty("driver")
-    private String driver;
-    @JsonProperty("fsType")
-    private String fsType;
-    @JsonProperty("nodePublishSecretRef")
-    private ClusterServiceVersionSpecISpecDSpecTSpecVCNodePublishSecretRef nodePublishSecretRef;
-    @JsonProperty("readOnly")
-    private Boolean readOnly;
-    @JsonProperty("volumeAttributes")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, String> volumeAttributes = new LinkedHashMap<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVCsi() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVCsi(String driver, String fsType, ClusterServiceVersionSpecISpecDSpecTSpecVCNodePublishSecretRef nodePublishSecretRef, Boolean readOnly, Map<String, String> volumeAttributes) {
-        super();
-        this.driver = driver;
-        this.fsType = fsType;
-        this.nodePublishSecretRef = nodePublishSecretRef;
-        this.readOnly = readOnly;
-        this.volumeAttributes = volumeAttributes;
-    }
-
-    @JsonProperty("driver")
-    public String getDriver() {
-        return driver;
-    }
-
-    @JsonProperty("driver")
-    public void setDriver(String driver) {
-        this.driver = driver;
-    }
-
-    @JsonProperty("fsType")
-    public String getFsType() {
-        return fsType;
-    }
-
-    @JsonProperty("fsType")
-    public void setFsType(String fsType) {
-        this.fsType = fsType;
-    }
-
-    @JsonProperty("nodePublishSecretRef")
-    public ClusterServiceVersionSpecISpecDSpecTSpecVCNodePublishSecretRef getNodePublishSecretRef() {
-        return nodePublishSecretRef;
-    }
-
-    @JsonProperty("nodePublishSecretRef")
-    public void setNodePublishSecretRef(ClusterServiceVersionSpecISpecDSpecTSpecVCNodePublishSecretRef nodePublishSecretRef) {
-        this.nodePublishSecretRef = nodePublishSecretRef;
-    }
-
-    @JsonProperty("readOnly")
-    public Boolean getReadOnly() {
-        return readOnly;
-    }
-
-    @JsonProperty("readOnly")
-    public void setReadOnly(Boolean readOnly) {
-        this.readOnly = readOnly;
-    }
-
-    @JsonProperty("volumeAttributes")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, String> getVolumeAttributes() {
-        return volumeAttributes;
-    }
-
-    @JsonProperty("volumeAttributes")
-    public void setVolumeAttributes(Map<String, String> volumeAttributes) {
-        this.volumeAttributes = volumeAttributes;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVCsiBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVCsiBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVCsiBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVDAIFieldRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVDAIFieldRef.java
deleted file mode 100644
index 0165c57b16e..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVDAIFieldRef.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "apiVersion",
-    "fieldPath"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVDAIFieldRef implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVDAIFieldRefBuilder> , KubernetesResource
-{
-
-    @JsonProperty("apiVersion")
-    private String apiVersion;
-    @JsonProperty("fieldPath")
-    private String fieldPath;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVDAIFieldRef() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVDAIFieldRef(String apiVersion, String fieldPath) {
-        super();
-        this.apiVersion = apiVersion;
-        this.fieldPath = fieldPath;
-    }
-
-    @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;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVDAIFieldRefBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVDAIFieldRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVDAIFieldRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVDAIResourceFieldRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVDAIResourceFieldRef.java
deleted file mode 100644
index 5f17cf658ba..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVDAIResourceFieldRef.java
+++ /dev/null
@@ -1,138 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "containerName",
-    "divisor",
-    "resource"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVDAIResourceFieldRef implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVDAIResourceFieldRefBuilder> , KubernetesResource
-{
-
-    @JsonProperty("containerName")
-    private String containerName;
-    @JsonProperty("divisor")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object divisor;
-    @JsonProperty("resource")
-    private String resource;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVDAIResourceFieldRef() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVDAIResourceFieldRef(String containerName, Object divisor, String resource) {
-        super();
-        this.containerName = containerName;
-        this.divisor = divisor;
-        this.resource = resource;
-    }
-
-    @JsonProperty("containerName")
-    public String getContainerName() {
-        return containerName;
-    }
-
-    @JsonProperty("containerName")
-    public void setContainerName(String containerName) {
-        this.containerName = containerName;
-    }
-
-    @JsonProperty("divisor")
-    public Object getDivisor() {
-        return divisor;
-    }
-
-    @JsonProperty("divisor")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setDivisor(Object divisor) {
-        this.divisor = divisor;
-    }
-
-    @JsonProperty("resource")
-    public String getResource() {
-        return resource;
-    }
-
-    @JsonProperty("resource")
-    public void setResource(String resource) {
-        this.resource = resource;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVDAIResourceFieldRefBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVDAIResourceFieldRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVDAIResourceFieldRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVDAItems.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVDAItems.java
deleted file mode 100644
index f956325e208..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVDAItems.java
+++ /dev/null
@@ -1,150 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "fieldRef",
-    "mode",
-    "path",
-    "resourceFieldRef"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVDAItems implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVDAItemsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("fieldRef")
-    private ClusterServiceVersionSpecISpecDSpecTSpecVDAIFieldRef fieldRef;
-    @JsonProperty("mode")
-    private Integer mode;
-    @JsonProperty("path")
-    private String path;
-    @JsonProperty("resourceFieldRef")
-    private ClusterServiceVersionSpecISpecDSpecTSpecVDAIResourceFieldRef resourceFieldRef;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVDAItems() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVDAItems(ClusterServiceVersionSpecISpecDSpecTSpecVDAIFieldRef fieldRef, Integer mode, String path, ClusterServiceVersionSpecISpecDSpecTSpecVDAIResourceFieldRef resourceFieldRef) {
-        super();
-        this.fieldRef = fieldRef;
-        this.mode = mode;
-        this.path = path;
-        this.resourceFieldRef = resourceFieldRef;
-    }
-
-    @JsonProperty("fieldRef")
-    public ClusterServiceVersionSpecISpecDSpecTSpecVDAIFieldRef getFieldRef() {
-        return fieldRef;
-    }
-
-    @JsonProperty("fieldRef")
-    public void setFieldRef(ClusterServiceVersionSpecISpecDSpecTSpecVDAIFieldRef fieldRef) {
-        this.fieldRef = fieldRef;
-    }
-
-    @JsonProperty("mode")
-    public Integer getMode() {
-        return mode;
-    }
-
-    @JsonProperty("mode")
-    public void setMode(Integer mode) {
-        this.mode = mode;
-    }
-
-    @JsonProperty("path")
-    public String getPath() {
-        return path;
-    }
-
-    @JsonProperty("path")
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @JsonProperty("resourceFieldRef")
-    public ClusterServiceVersionSpecISpecDSpecTSpecVDAIResourceFieldRef getResourceFieldRef() {
-        return resourceFieldRef;
-    }
-
-    @JsonProperty("resourceFieldRef")
-    public void setResourceFieldRef(ClusterServiceVersionSpecISpecDSpecTSpecVDAIResourceFieldRef resourceFieldRef) {
-        this.resourceFieldRef = resourceFieldRef;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVDAItemsBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVDAItemsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVDAItemsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVDownwardAPI.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVDownwardAPI.java
deleted file mode 100644
index 5070edc66bb..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVDownwardAPI.java
+++ /dev/null
@@ -1,126 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "defaultMode",
-    "items"
-})
-@ToString
-@EqualsAndHashCode
-@Accessors(prefix = {
-    "_",
-    ""
-})
-@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
-    @BuildableReference(ObjectMeta.class),
-    @BuildableReference(LabelSelector.class),
-    @BuildableReference(Container.class),
-    @BuildableReference(PodTemplateSpec.class),
-    @BuildableReference(ResourceRequirements.class),
-    @BuildableReference(IntOrString.class),
-    @BuildableReference(ObjectReference.class),
-    @BuildableReference(LocalObjectReference.class),
-    @BuildableReference(PersistentVolumeClaim.class)
-})
-@Generated("jsonschema2pojo")
-public class ClusterServiceVersionSpecISpecDSpecTSpecVDownwardAPI implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVDownwardAPIBuilder> , KubernetesResource
-{
-
-    @JsonProperty("defaultMode")
-    private Integer defaultMode;
-    @JsonProperty("items")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecVDAItems> items = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVDownwardAPI() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVDownwardAPI(Integer defaultMode, List<ClusterServiceVersionSpecISpecDSpecTSpecVDAItems> items) {
-        super();
-        this.defaultMode = defaultMode;
-        this.items = items;
-    }
-
-    @JsonProperty("defaultMode")
-    public Integer getDefaultMode() {
-        return defaultMode;
-    }
-
-    @JsonProperty("defaultMode")
-    public void setDefaultMode(Integer defaultMode) {
-        this.defaultMode = defaultMode;
-    }
-
-    @JsonProperty("items")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecVDAItems> getItems() {
-        return items;
-    }
-
-    @JsonProperty("items")
-    public void setItems(List<ClusterServiceVersionSpecISpecDSpecTSpecVDAItems> items) {
-        this.items = items;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVDownwardAPIBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVDownwardAPIBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVDownwardAPIBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpec.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpec.java
deleted file mode 100644
index 63002beeb8b..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpec.java
+++ /dev/null
@@ -1,224 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "accessModes",
-    "dataSource",
-    "dataSourceRef",
-    "resources",
-    "selector",
-    "storageClassName",
-    "volumeAttributesClassName",
-    "volumeMode",
-    "volumeName"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpec implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecBuilder> , KubernetesResource
-{
-
-    @JsonProperty("accessModes")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> accessModes = new ArrayList<>();
-    @JsonProperty("dataSource")
-    private ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecDataSource dataSource;
-    @JsonProperty("dataSourceRef")
-    private ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecDataSourceRef dataSourceRef;
-    @JsonProperty("resources")
-    private ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecResources resources;
-    @JsonProperty("selector")
-    private ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecSelector selector;
-    @JsonProperty("storageClassName")
-    private String storageClassName;
-    @JsonProperty("volumeAttributesClassName")
-    private String volumeAttributesClassName;
-    @JsonProperty("volumeMode")
-    private String volumeMode;
-    @JsonProperty("volumeName")
-    private String volumeName;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpec() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpec(List<String> accessModes, ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecDataSource dataSource, ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecDataSourceRef dataSourceRef, ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecResources resources, ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecSelector selector, String storageClassName, String volumeAttributesClassName, String volumeMode, String volumeName) {
-        super();
-        this.accessModes = accessModes;
-        this.dataSource = dataSource;
-        this.dataSourceRef = dataSourceRef;
-        this.resources = resources;
-        this.selector = selector;
-        this.storageClassName = storageClassName;
-        this.volumeAttributesClassName = volumeAttributesClassName;
-        this.volumeMode = volumeMode;
-        this.volumeName = volumeName;
-    }
-
-    @JsonProperty("accessModes")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getAccessModes() {
-        return accessModes;
-    }
-
-    @JsonProperty("accessModes")
-    public void setAccessModes(List<String> accessModes) {
-        this.accessModes = accessModes;
-    }
-
-    @JsonProperty("dataSource")
-    public ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecDataSource getDataSource() {
-        return dataSource;
-    }
-
-    @JsonProperty("dataSource")
-    public void setDataSource(ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecDataSource dataSource) {
-        this.dataSource = dataSource;
-    }
-
-    @JsonProperty("dataSourceRef")
-    public ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecDataSourceRef getDataSourceRef() {
-        return dataSourceRef;
-    }
-
-    @JsonProperty("dataSourceRef")
-    public void setDataSourceRef(ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecDataSourceRef dataSourceRef) {
-        this.dataSourceRef = dataSourceRef;
-    }
-
-    @JsonProperty("resources")
-    public ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecResources getResources() {
-        return resources;
-    }
-
-    @JsonProperty("resources")
-    public void setResources(ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecResources resources) {
-        this.resources = resources;
-    }
-
-    @JsonProperty("selector")
-    public ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecSelector getSelector() {
-        return selector;
-    }
-
-    @JsonProperty("selector")
-    public void setSelector(ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecSelector selector) {
-        this.selector = selector;
-    }
-
-    @JsonProperty("storageClassName")
-    public String getStorageClassName() {
-        return storageClassName;
-    }
-
-    @JsonProperty("storageClassName")
-    public void setStorageClassName(String storageClassName) {
-        this.storageClassName = storageClassName;
-    }
-
-    @JsonProperty("volumeAttributesClassName")
-    public String getVolumeAttributesClassName() {
-        return volumeAttributesClassName;
-    }
-
-    @JsonProperty("volumeAttributesClassName")
-    public void setVolumeAttributesClassName(String volumeAttributesClassName) {
-        this.volumeAttributesClassName = volumeAttributesClassName;
-    }
-
-    @JsonProperty("volumeMode")
-    public String getVolumeMode() {
-        return volumeMode;
-    }
-
-    @JsonProperty("volumeMode")
-    public void setVolumeMode(String volumeMode) {
-        this.volumeMode = volumeMode;
-    }
-
-    @JsonProperty("volumeName")
-    public String getVolumeName() {
-        return volumeName;
-    }
-
-    @JsonProperty("volumeName")
-    public void setVolumeName(String volumeName) {
-        this.volumeName = volumeName;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecDataSource.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecDataSource.java
deleted file mode 100644
index 97c6a65fdc5..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecDataSource.java
+++ /dev/null
@@ -1,136 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "kind",
-    "apiGroup",
-    "name"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecDataSource implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecDataSourceBuilder> , KubernetesResource
-{
-
-    @JsonProperty("apiGroup")
-    private String apiGroup;
-    @JsonProperty("kind")
-    private String kind;
-    @JsonProperty("name")
-    private String name;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecDataSource() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecDataSource(String apiGroup, String kind, String name) {
-        super();
-        this.apiGroup = apiGroup;
-        this.kind = kind;
-        this.name = name;
-    }
-
-    @JsonProperty("apiGroup")
-    public String getApiGroup() {
-        return apiGroup;
-    }
-
-    @JsonProperty("apiGroup")
-    public void setApiGroup(String apiGroup) {
-        this.apiGroup = apiGroup;
-    }
-
-    @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;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecDataSourceBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecDataSourceBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecDataSourceBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecDataSourceRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecDataSourceRef.java
deleted file mode 100644
index 4bb945c301c..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecDataSourceRef.java
+++ /dev/null
@@ -1,150 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "kind",
-    "apiGroup",
-    "name",
-    "namespace"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecDataSourceRef implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecDataSourceRefBuilder> , KubernetesResource
-{
-
-    @JsonProperty("apiGroup")
-    private String apiGroup;
-    @JsonProperty("kind")
-    private String kind;
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("namespace")
-    private String namespace;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecDataSourceRef() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecDataSourceRef(String apiGroup, String kind, String name, String namespace) {
-        super();
-        this.apiGroup = apiGroup;
-        this.kind = kind;
-        this.name = name;
-        this.namespace = namespace;
-    }
-
-    @JsonProperty("apiGroup")
-    public String getApiGroup() {
-        return apiGroup;
-    }
-
-    @JsonProperty("apiGroup")
-    public void setApiGroup(String apiGroup) {
-        this.apiGroup = apiGroup;
-    }
-
-    @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;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecDataSourceRefBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecDataSourceRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecDataSourceRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecResources.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecResources.java
deleted file mode 100644
index bf195ada8e4..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecResources.java
+++ /dev/null
@@ -1,130 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "limits",
-    "requests"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecResources implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecResourcesBuilder> , KubernetesResource
-{
-
-    @JsonProperty("limits")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializerForMap.class)
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, Object> limits = new LinkedHashMap<>();
-    @JsonProperty("requests")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializerForMap.class)
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, Object> requests = new LinkedHashMap<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecResources() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecResources(Map<String, Object> limits, Map<String, Object> requests) {
-        super();
-        this.limits = limits;
-        this.requests = requests;
-    }
-
-    @JsonProperty("limits")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, Object> getLimits() {
-        return limits;
-    }
-
-    @JsonProperty("limits")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializerForMap.class)
-    public void setLimits(Map<String, Object> limits) {
-        this.limits = limits;
-    }
-
-    @JsonProperty("requests")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, Object> getRequests() {
-        return requests;
-    }
-
-    @JsonProperty("requests")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializerForMap.class)
-    public void setRequests(Map<String, Object> requests) {
-        this.requests = requests;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecResourcesBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecResourcesBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecResourcesBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecSMatchExpressions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecSMatchExpressions.java
deleted file mode 100644
index 7a4d11aac52..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecSMatchExpressions.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "operator",
-    "values"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecSMatchExpressions implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecSMatchExpressionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("operator")
-    private String operator;
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> values = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecSMatchExpressions() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecSMatchExpressions(String key, String operator, List<String> values) {
-        super();
-        this.key = key;
-        this.operator = operator;
-        this.values = values;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("operator")
-    public String getOperator() {
-        return operator;
-    }
-
-    @JsonProperty("operator")
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getValues() {
-        return values;
-    }
-
-    @JsonProperty("values")
-    public void setValues(List<String> values) {
-        this.values = values;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecSMatchExpressionsBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecSMatchExpressionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecSMatchExpressionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecSelector.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecSelector.java
deleted file mode 100644
index b8dc0550bd3..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecSelector.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "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 ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecSelector implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecSelectorBuilder> , KubernetesResource
-{
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecSMatchExpressions> matchExpressions = new ArrayList<>();
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, String> matchLabels = new LinkedHashMap<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecSelector() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecSelector(List<ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecSMatchExpressions> matchExpressions, Map<String, String> matchLabels) {
-        super();
-        this.matchExpressions = matchExpressions;
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecSMatchExpressions> getMatchExpressions() {
-        return matchExpressions;
-    }
-
-    @JsonProperty("matchExpressions")
-    public void setMatchExpressions(List<ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecSMatchExpressions> matchExpressions) {
-        this.matchExpressions = matchExpressions;
-    }
-
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, String> getMatchLabels() {
-        return matchLabels;
-    }
-
-    @JsonProperty("matchLabels")
-    public void setMatchLabels(Map<String, String> matchLabels) {
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecSelectorBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecSelectorBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpecSelectorBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVEVolumeClaimTemplate.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVEVolumeClaimTemplate.java
deleted file mode 100644
index 043b4059db5..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVEVolumeClaimTemplate.java
+++ /dev/null
@@ -1,124 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "metadata",
-    "spec"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVEVolumeClaimTemplate implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVEVolumeClaimTemplateBuilder> , KubernetesResource
-{
-
-    @JsonProperty("metadata")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object metadata;
-    @JsonProperty("spec")
-    private ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpec spec;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVEVolumeClaimTemplate() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVEVolumeClaimTemplate(Object metadata, ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpec spec) {
-        super();
-        this.metadata = metadata;
-        this.spec = spec;
-    }
-
-    @JsonProperty("metadata")
-    public Object getMetadata() {
-        return metadata;
-    }
-
-    @JsonProperty("metadata")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setMetadata(Object metadata) {
-        this.metadata = metadata;
-    }
-
-    @JsonProperty("spec")
-    public ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpec getSpec() {
-        return spec;
-    }
-
-    @JsonProperty("spec")
-    public void setSpec(ClusterServiceVersionSpecISpecDSpecTSpecVEVCTSpec spec) {
-        this.spec = spec;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVEVolumeClaimTemplateBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVEVolumeClaimTemplateBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVEVolumeClaimTemplateBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVEmptyDir.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVEmptyDir.java
deleted file mode 100644
index 4babd332eb9..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVEmptyDir.java
+++ /dev/null
@@ -1,124 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "medium",
-    "sizeLimit"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVEmptyDir implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVEmptyDirBuilder> , KubernetesResource
-{
-
-    @JsonProperty("medium")
-    private String medium;
-    @JsonProperty("sizeLimit")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object sizeLimit;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVEmptyDir() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVEmptyDir(String medium, Object sizeLimit) {
-        super();
-        this.medium = medium;
-        this.sizeLimit = sizeLimit;
-    }
-
-    @JsonProperty("medium")
-    public String getMedium() {
-        return medium;
-    }
-
-    @JsonProperty("medium")
-    public void setMedium(String medium) {
-        this.medium = medium;
-    }
-
-    @JsonProperty("sizeLimit")
-    public Object getSizeLimit() {
-        return sizeLimit;
-    }
-
-    @JsonProperty("sizeLimit")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setSizeLimit(Object sizeLimit) {
-        this.sizeLimit = sizeLimit;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVEmptyDirBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVEmptyDirBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVEmptyDirBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVEphemeral.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVEphemeral.java
deleted file mode 100644
index 8db12ed04d4..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVEphemeral.java
+++ /dev/null
@@ -1,108 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "volumeClaimTemplate"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVEphemeral implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVEphemeralBuilder> , KubernetesResource
-{
-
-    @JsonProperty("volumeClaimTemplate")
-    private ClusterServiceVersionSpecISpecDSpecTSpecVEVolumeClaimTemplate volumeClaimTemplate;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVEphemeral() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVEphemeral(ClusterServiceVersionSpecISpecDSpecTSpecVEVolumeClaimTemplate volumeClaimTemplate) {
-        super();
-        this.volumeClaimTemplate = volumeClaimTemplate;
-    }
-
-    @JsonProperty("volumeClaimTemplate")
-    public ClusterServiceVersionSpecISpecDSpecTSpecVEVolumeClaimTemplate getVolumeClaimTemplate() {
-        return volumeClaimTemplate;
-    }
-
-    @JsonProperty("volumeClaimTemplate")
-    public void setVolumeClaimTemplate(ClusterServiceVersionSpecISpecDSpecTSpecVEVolumeClaimTemplate volumeClaimTemplate) {
-        this.volumeClaimTemplate = volumeClaimTemplate;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVEphemeralBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVEphemeralBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVEphemeralBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVFVSecretRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVFVSecretRef.java
deleted file mode 100644
index 882ff38f7ce..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVFVSecretRef.java
+++ /dev/null
@@ -1,108 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVFVSecretRef implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVFVSecretRefBuilder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVFVSecretRef() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVFVSecretRef(String name) {
-        super();
-        this.name = name;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVFVSecretRefBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVFVSecretRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVFVSecretRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVFc.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVFc.java
deleted file mode 100644
index 25d9dd74fd7..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVFc.java
+++ /dev/null
@@ -1,170 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "fsType",
-    "lun",
-    "readOnly",
-    "targetWWNs",
-    "wwids"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVFc implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVFcBuilder> , KubernetesResource
-{
-
-    @JsonProperty("fsType")
-    private String fsType;
-    @JsonProperty("lun")
-    private Integer lun;
-    @JsonProperty("readOnly")
-    private Boolean readOnly;
-    @JsonProperty("targetWWNs")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> targetWWNs = new ArrayList<>();
-    @JsonProperty("wwids")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> wwids = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVFc() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVFc(String fsType, Integer lun, Boolean readOnly, List<String> targetWWNs, List<String> wwids) {
-        super();
-        this.fsType = fsType;
-        this.lun = lun;
-        this.readOnly = readOnly;
-        this.targetWWNs = targetWWNs;
-        this.wwids = wwids;
-    }
-
-    @JsonProperty("fsType")
-    public String getFsType() {
-        return fsType;
-    }
-
-    @JsonProperty("fsType")
-    public void setFsType(String fsType) {
-        this.fsType = fsType;
-    }
-
-    @JsonProperty("lun")
-    public Integer getLun() {
-        return lun;
-    }
-
-    @JsonProperty("lun")
-    public void setLun(Integer lun) {
-        this.lun = lun;
-    }
-
-    @JsonProperty("readOnly")
-    public Boolean getReadOnly() {
-        return readOnly;
-    }
-
-    @JsonProperty("readOnly")
-    public void setReadOnly(Boolean readOnly) {
-        this.readOnly = readOnly;
-    }
-
-    @JsonProperty("targetWWNs")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getTargetWWNs() {
-        return targetWWNs;
-    }
-
-    @JsonProperty("targetWWNs")
-    public void setTargetWWNs(List<String> targetWWNs) {
-        this.targetWWNs = targetWWNs;
-    }
-
-    @JsonProperty("wwids")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getWwids() {
-        return wwids;
-    }
-
-    @JsonProperty("wwids")
-    public void setWwids(List<String> wwids) {
-        this.wwids = wwids;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVFcBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVFcBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVFcBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVFlexVolume.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVFlexVolume.java
deleted file mode 100644
index 78b627fae96..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVFlexVolume.java
+++ /dev/null
@@ -1,166 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "driver",
-    "fsType",
-    "options",
-    "readOnly",
-    "secretRef"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVFlexVolume implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVFlexVolumeBuilder> , KubernetesResource
-{
-
-    @JsonProperty("driver")
-    private String driver;
-    @JsonProperty("fsType")
-    private String fsType;
-    @JsonProperty("options")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, String> options = new LinkedHashMap<>();
-    @JsonProperty("readOnly")
-    private Boolean readOnly;
-    @JsonProperty("secretRef")
-    private ClusterServiceVersionSpecISpecDSpecTSpecVFVSecretRef secretRef;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVFlexVolume() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVFlexVolume(String driver, String fsType, Map<String, String> options, Boolean readOnly, ClusterServiceVersionSpecISpecDSpecTSpecVFVSecretRef secretRef) {
-        super();
-        this.driver = driver;
-        this.fsType = fsType;
-        this.options = options;
-        this.readOnly = readOnly;
-        this.secretRef = secretRef;
-    }
-
-    @JsonProperty("driver")
-    public String getDriver() {
-        return driver;
-    }
-
-    @JsonProperty("driver")
-    public void setDriver(String driver) {
-        this.driver = driver;
-    }
-
-    @JsonProperty("fsType")
-    public String getFsType() {
-        return fsType;
-    }
-
-    @JsonProperty("fsType")
-    public void setFsType(String fsType) {
-        this.fsType = fsType;
-    }
-
-    @JsonProperty("options")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, String> getOptions() {
-        return options;
-    }
-
-    @JsonProperty("options")
-    public void setOptions(Map<String, String> options) {
-        this.options = options;
-    }
-
-    @JsonProperty("readOnly")
-    public Boolean getReadOnly() {
-        return readOnly;
-    }
-
-    @JsonProperty("readOnly")
-    public void setReadOnly(Boolean readOnly) {
-        this.readOnly = readOnly;
-    }
-
-    @JsonProperty("secretRef")
-    public ClusterServiceVersionSpecISpecDSpecTSpecVFVSecretRef getSecretRef() {
-        return secretRef;
-    }
-
-    @JsonProperty("secretRef")
-    public void setSecretRef(ClusterServiceVersionSpecISpecDSpecTSpecVFVSecretRef secretRef) {
-        this.secretRef = secretRef;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVFlexVolumeBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVFlexVolumeBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVFlexVolumeBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVFlocker.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVFlocker.java
deleted file mode 100644
index 8c997181e78..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVFlocker.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "datasetName",
-    "datasetUUID"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVFlocker implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVFlockerBuilder> , KubernetesResource
-{
-
-    @JsonProperty("datasetName")
-    private String datasetName;
-    @JsonProperty("datasetUUID")
-    private String datasetUUID;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVFlocker() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVFlocker(String datasetName, String datasetUUID) {
-        super();
-        this.datasetName = datasetName;
-        this.datasetUUID = datasetUUID;
-    }
-
-    @JsonProperty("datasetName")
-    public String getDatasetName() {
-        return datasetName;
-    }
-
-    @JsonProperty("datasetName")
-    public void setDatasetName(String datasetName) {
-        this.datasetName = datasetName;
-    }
-
-    @JsonProperty("datasetUUID")
-    public String getDatasetUUID() {
-        return datasetUUID;
-    }
-
-    @JsonProperty("datasetUUID")
-    public void setDatasetUUID(String datasetUUID) {
-        this.datasetUUID = datasetUUID;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVFlockerBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVFlockerBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVFlockerBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVGcePersistentDisk.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVGcePersistentDisk.java
deleted file mode 100644
index a0d7dae822f..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVGcePersistentDisk.java
+++ /dev/null
@@ -1,150 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "fsType",
-    "partition",
-    "pdName",
-    "readOnly"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVGcePersistentDisk implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVGcePersistentDiskBuilder> , KubernetesResource
-{
-
-    @JsonProperty("fsType")
-    private String fsType;
-    @JsonProperty("partition")
-    private Integer partition;
-    @JsonProperty("pdName")
-    private String pdName;
-    @JsonProperty("readOnly")
-    private Boolean readOnly;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVGcePersistentDisk() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVGcePersistentDisk(String fsType, Integer partition, String pdName, Boolean readOnly) {
-        super();
-        this.fsType = fsType;
-        this.partition = partition;
-        this.pdName = pdName;
-        this.readOnly = readOnly;
-    }
-
-    @JsonProperty("fsType")
-    public String getFsType() {
-        return fsType;
-    }
-
-    @JsonProperty("fsType")
-    public void setFsType(String fsType) {
-        this.fsType = fsType;
-    }
-
-    @JsonProperty("partition")
-    public Integer getPartition() {
-        return partition;
-    }
-
-    @JsonProperty("partition")
-    public void setPartition(Integer partition) {
-        this.partition = partition;
-    }
-
-    @JsonProperty("pdName")
-    public String getPdName() {
-        return pdName;
-    }
-
-    @JsonProperty("pdName")
-    public void setPdName(String pdName) {
-        this.pdName = pdName;
-    }
-
-    @JsonProperty("readOnly")
-    public Boolean getReadOnly() {
-        return readOnly;
-    }
-
-    @JsonProperty("readOnly")
-    public void setReadOnly(Boolean readOnly) {
-        this.readOnly = readOnly;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVGcePersistentDiskBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVGcePersistentDiskBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVGcePersistentDiskBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVGitRepo.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVGitRepo.java
deleted file mode 100644
index 38873a17211..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVGitRepo.java
+++ /dev/null
@@ -1,136 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "directory",
-    "repository",
-    "revision"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVGitRepo implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVGitRepoBuilder> , KubernetesResource
-{
-
-    @JsonProperty("directory")
-    private String directory;
-    @JsonProperty("repository")
-    private String repository;
-    @JsonProperty("revision")
-    private String revision;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVGitRepo() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVGitRepo(String directory, String repository, String revision) {
-        super();
-        this.directory = directory;
-        this.repository = repository;
-        this.revision = revision;
-    }
-
-    @JsonProperty("directory")
-    public String getDirectory() {
-        return directory;
-    }
-
-    @JsonProperty("directory")
-    public void setDirectory(String directory) {
-        this.directory = directory;
-    }
-
-    @JsonProperty("repository")
-    public String getRepository() {
-        return repository;
-    }
-
-    @JsonProperty("repository")
-    public void setRepository(String repository) {
-        this.repository = repository;
-    }
-
-    @JsonProperty("revision")
-    public String getRevision() {
-        return revision;
-    }
-
-    @JsonProperty("revision")
-    public void setRevision(String revision) {
-        this.revision = revision;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVGitRepoBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVGitRepoBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVGitRepoBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVGlusterfs.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVGlusterfs.java
deleted file mode 100644
index 8ce1b0d6084..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVGlusterfs.java
+++ /dev/null
@@ -1,136 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "endpoints",
-    "path",
-    "readOnly"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVGlusterfs implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVGlusterfsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("endpoints")
-    private String endpoints;
-    @JsonProperty("path")
-    private String path;
-    @JsonProperty("readOnly")
-    private Boolean readOnly;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVGlusterfs() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVGlusterfs(String endpoints, String path, Boolean readOnly) {
-        super();
-        this.endpoints = endpoints;
-        this.path = path;
-        this.readOnly = readOnly;
-    }
-
-    @JsonProperty("endpoints")
-    public String getEndpoints() {
-        return endpoints;
-    }
-
-    @JsonProperty("endpoints")
-    public void setEndpoints(String endpoints) {
-        this.endpoints = endpoints;
-    }
-
-    @JsonProperty("path")
-    public String getPath() {
-        return path;
-    }
-
-    @JsonProperty("path")
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @JsonProperty("readOnly")
-    public Boolean getReadOnly() {
-        return readOnly;
-    }
-
-    @JsonProperty("readOnly")
-    public void setReadOnly(Boolean readOnly) {
-        this.readOnly = readOnly;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVGlusterfsBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVGlusterfsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVGlusterfsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVHostPath.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVHostPath.java
deleted file mode 100644
index f86b701eec9..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVHostPath.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "path",
-    "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 ClusterServiceVersionSpecISpecDSpecTSpecVHostPath implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVHostPathBuilder> , KubernetesResource
-{
-
-    @JsonProperty("path")
-    private String path;
-    @JsonProperty("type")
-    private String type;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVHostPath() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVHostPath(String path, String type) {
-        super();
-        this.path = path;
-        this.type = type;
-    }
-
-    @JsonProperty("path")
-    public String getPath() {
-        return path;
-    }
-
-    @JsonProperty("path")
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @JsonProperty("type")
-    public String getType() {
-        return type;
-    }
-
-    @JsonProperty("type")
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVHostPathBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVHostPathBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVHostPathBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVISecretRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVISecretRef.java
deleted file mode 100644
index f976dea4d6a..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVISecretRef.java
+++ /dev/null
@@ -1,108 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVISecretRef implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVISecretRefBuilder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVISecretRef() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVISecretRef(String name) {
-        super();
-        this.name = name;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVISecretRefBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVISecretRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVISecretRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVIscsi.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVIscsi.java
deleted file mode 100644
index 28772ec51e5..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVIscsi.java
+++ /dev/null
@@ -1,252 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "chapAuthDiscovery",
-    "chapAuthSession",
-    "fsType",
-    "initiatorName",
-    "iqn",
-    "iscsiInterface",
-    "lun",
-    "portals",
-    "readOnly",
-    "secretRef",
-    "targetPortal"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVIscsi implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVIscsiBuilder> , KubernetesResource
-{
-
-    @JsonProperty("chapAuthDiscovery")
-    private Boolean chapAuthDiscovery;
-    @JsonProperty("chapAuthSession")
-    private Boolean chapAuthSession;
-    @JsonProperty("fsType")
-    private String fsType;
-    @JsonProperty("initiatorName")
-    private String initiatorName;
-    @JsonProperty("iqn")
-    private String iqn;
-    @JsonProperty("iscsiInterface")
-    private String iscsiInterface;
-    @JsonProperty("lun")
-    private Integer lun;
-    @JsonProperty("portals")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> portals = new ArrayList<>();
-    @JsonProperty("readOnly")
-    private Boolean readOnly;
-    @JsonProperty("secretRef")
-    private ClusterServiceVersionSpecISpecDSpecTSpecVISecretRef secretRef;
-    @JsonProperty("targetPortal")
-    private String targetPortal;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVIscsi() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVIscsi(Boolean chapAuthDiscovery, Boolean chapAuthSession, String fsType, String initiatorName, String iqn, String iscsiInterface, Integer lun, List<String> portals, Boolean readOnly, ClusterServiceVersionSpecISpecDSpecTSpecVISecretRef secretRef, String targetPortal) {
-        super();
-        this.chapAuthDiscovery = chapAuthDiscovery;
-        this.chapAuthSession = chapAuthSession;
-        this.fsType = fsType;
-        this.initiatorName = initiatorName;
-        this.iqn = iqn;
-        this.iscsiInterface = iscsiInterface;
-        this.lun = lun;
-        this.portals = portals;
-        this.readOnly = readOnly;
-        this.secretRef = secretRef;
-        this.targetPortal = targetPortal;
-    }
-
-    @JsonProperty("chapAuthDiscovery")
-    public Boolean getChapAuthDiscovery() {
-        return chapAuthDiscovery;
-    }
-
-    @JsonProperty("chapAuthDiscovery")
-    public void setChapAuthDiscovery(Boolean chapAuthDiscovery) {
-        this.chapAuthDiscovery = chapAuthDiscovery;
-    }
-
-    @JsonProperty("chapAuthSession")
-    public Boolean getChapAuthSession() {
-        return chapAuthSession;
-    }
-
-    @JsonProperty("chapAuthSession")
-    public void setChapAuthSession(Boolean chapAuthSession) {
-        this.chapAuthSession = chapAuthSession;
-    }
-
-    @JsonProperty("fsType")
-    public String getFsType() {
-        return fsType;
-    }
-
-    @JsonProperty("fsType")
-    public void setFsType(String fsType) {
-        this.fsType = fsType;
-    }
-
-    @JsonProperty("initiatorName")
-    public String getInitiatorName() {
-        return initiatorName;
-    }
-
-    @JsonProperty("initiatorName")
-    public void setInitiatorName(String initiatorName) {
-        this.initiatorName = initiatorName;
-    }
-
-    @JsonProperty("iqn")
-    public String getIqn() {
-        return iqn;
-    }
-
-    @JsonProperty("iqn")
-    public void setIqn(String iqn) {
-        this.iqn = iqn;
-    }
-
-    @JsonProperty("iscsiInterface")
-    public String getIscsiInterface() {
-        return iscsiInterface;
-    }
-
-    @JsonProperty("iscsiInterface")
-    public void setIscsiInterface(String iscsiInterface) {
-        this.iscsiInterface = iscsiInterface;
-    }
-
-    @JsonProperty("lun")
-    public Integer getLun() {
-        return lun;
-    }
-
-    @JsonProperty("lun")
-    public void setLun(Integer lun) {
-        this.lun = lun;
-    }
-
-    @JsonProperty("portals")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getPortals() {
-        return portals;
-    }
-
-    @JsonProperty("portals")
-    public void setPortals(List<String> portals) {
-        this.portals = portals;
-    }
-
-    @JsonProperty("readOnly")
-    public Boolean getReadOnly() {
-        return readOnly;
-    }
-
-    @JsonProperty("readOnly")
-    public void setReadOnly(Boolean readOnly) {
-        this.readOnly = readOnly;
-    }
-
-    @JsonProperty("secretRef")
-    public ClusterServiceVersionSpecISpecDSpecTSpecVISecretRef getSecretRef() {
-        return secretRef;
-    }
-
-    @JsonProperty("secretRef")
-    public void setSecretRef(ClusterServiceVersionSpecISpecDSpecTSpecVISecretRef secretRef) {
-        this.secretRef = secretRef;
-    }
-
-    @JsonProperty("targetPortal")
-    public String getTargetPortal() {
-        return targetPortal;
-    }
-
-    @JsonProperty("targetPortal")
-    public void setTargetPortal(String targetPortal) {
-        this.targetPortal = targetPortal;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVIscsiBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVIscsiBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVIscsiBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVNfs.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVNfs.java
deleted file mode 100644
index bb54232c648..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVNfs.java
+++ /dev/null
@@ -1,136 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "path",
-    "readOnly",
-    "server"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVNfs implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVNfsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("path")
-    private String path;
-    @JsonProperty("readOnly")
-    private Boolean readOnly;
-    @JsonProperty("server")
-    private String server;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVNfs() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVNfs(String path, Boolean readOnly, String server) {
-        super();
-        this.path = path;
-        this.readOnly = readOnly;
-        this.server = server;
-    }
-
-    @JsonProperty("path")
-    public String getPath() {
-        return path;
-    }
-
-    @JsonProperty("path")
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @JsonProperty("readOnly")
-    public Boolean getReadOnly() {
-        return readOnly;
-    }
-
-    @JsonProperty("readOnly")
-    public void setReadOnly(Boolean readOnly) {
-        this.readOnly = readOnly;
-    }
-
-    @JsonProperty("server")
-    public String getServer() {
-        return server;
-    }
-
-    @JsonProperty("server")
-    public void setServer(String server) {
-        this.server = server;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVNfsBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVNfsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVNfsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVPSCMItems.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVPSCMItems.java
deleted file mode 100644
index 92c51d740e6..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVPSCMItems.java
+++ /dev/null
@@ -1,136 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "mode",
-    "path"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVPSCMItems implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVPSCMItemsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("mode")
-    private Integer mode;
-    @JsonProperty("path")
-    private String path;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSCMItems() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSCMItems(String key, Integer mode, String path) {
-        super();
-        this.key = key;
-        this.mode = mode;
-        this.path = path;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("mode")
-    public Integer getMode() {
-        return mode;
-    }
-
-    @JsonProperty("mode")
-    public void setMode(Integer mode) {
-        this.mode = mode;
-    }
-
-    @JsonProperty("path")
-    public String getPath() {
-        return path;
-    }
-
-    @JsonProperty("path")
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSCMItemsBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVPSCMItemsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSCMItemsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVPSCTBLSMatchExpressions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVPSCTBLSMatchExpressions.java
deleted file mode 100644
index 37c97997bfb..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVPSCTBLSMatchExpressions.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "operator",
-    "values"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVPSCTBLSMatchExpressions implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVPSCTBLSMatchExpressionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("operator")
-    private String operator;
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> values = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSCTBLSMatchExpressions() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSCTBLSMatchExpressions(String key, String operator, List<String> values) {
-        super();
-        this.key = key;
-        this.operator = operator;
-        this.values = values;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("operator")
-    public String getOperator() {
-        return operator;
-    }
-
-    @JsonProperty("operator")
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getValues() {
-        return values;
-    }
-
-    @JsonProperty("values")
-    public void setValues(List<String> values) {
-        this.values = values;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSCTBLSMatchExpressionsBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVPSCTBLSMatchExpressionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSCTBLSMatchExpressionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVPSCTBLabelSelector.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVPSCTBLabelSelector.java
deleted file mode 100644
index 80414d02b0a..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVPSCTBLabelSelector.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "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 ClusterServiceVersionSpecISpecDSpecTSpecVPSCTBLabelSelector implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVPSCTBLabelSelectorBuilder> , KubernetesResource
-{
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecVPSCTBLSMatchExpressions> matchExpressions = new ArrayList<>();
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, String> matchLabels = new LinkedHashMap<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSCTBLabelSelector() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSCTBLabelSelector(List<ClusterServiceVersionSpecISpecDSpecTSpecVPSCTBLSMatchExpressions> matchExpressions, Map<String, String> matchLabels) {
-        super();
-        this.matchExpressions = matchExpressions;
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecVPSCTBLSMatchExpressions> getMatchExpressions() {
-        return matchExpressions;
-    }
-
-    @JsonProperty("matchExpressions")
-    public void setMatchExpressions(List<ClusterServiceVersionSpecISpecDSpecTSpecVPSCTBLSMatchExpressions> matchExpressions) {
-        this.matchExpressions = matchExpressions;
-    }
-
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, String> getMatchLabels() {
-        return matchLabels;
-    }
-
-    @JsonProperty("matchLabels")
-    public void setMatchLabels(Map<String, String> matchLabels) {
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSCTBLabelSelectorBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVPSCTBLabelSelectorBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSCTBLabelSelectorBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVPSClusterTrustBundle.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVPSClusterTrustBundle.java
deleted file mode 100644
index 691ef28681a..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVPSClusterTrustBundle.java
+++ /dev/null
@@ -1,164 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "labelSelector",
-    "name",
-    "optional",
-    "path",
-    "signerName"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVPSClusterTrustBundle implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVPSClusterTrustBundleBuilder> , KubernetesResource
-{
-
-    @JsonProperty("labelSelector")
-    private ClusterServiceVersionSpecISpecDSpecTSpecVPSCTBLabelSelector labelSelector;
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("optional")
-    private Boolean optional;
-    @JsonProperty("path")
-    private String path;
-    @JsonProperty("signerName")
-    private String signerName;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSClusterTrustBundle() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSClusterTrustBundle(ClusterServiceVersionSpecISpecDSpecTSpecVPSCTBLabelSelector labelSelector, String name, Boolean optional, String path, String signerName) {
-        super();
-        this.labelSelector = labelSelector;
-        this.name = name;
-        this.optional = optional;
-        this.path = path;
-        this.signerName = signerName;
-    }
-
-    @JsonProperty("labelSelector")
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSCTBLabelSelector getLabelSelector() {
-        return labelSelector;
-    }
-
-    @JsonProperty("labelSelector")
-    public void setLabelSelector(ClusterServiceVersionSpecISpecDSpecTSpecVPSCTBLabelSelector labelSelector) {
-        this.labelSelector = labelSelector;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("optional")
-    public Boolean getOptional() {
-        return optional;
-    }
-
-    @JsonProperty("optional")
-    public void setOptional(Boolean optional) {
-        this.optional = optional;
-    }
-
-    @JsonProperty("path")
-    public String getPath() {
-        return path;
-    }
-
-    @JsonProperty("path")
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @JsonProperty("signerName")
-    public String getSignerName() {
-        return signerName;
-    }
-
-    @JsonProperty("signerName")
-    public void setSignerName(String signerName) {
-        this.signerName = signerName;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSClusterTrustBundleBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVPSClusterTrustBundleBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSClusterTrustBundleBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVPSConfigMap.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVPSConfigMap.java
deleted file mode 100644
index 66f2cbd18db..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVPSConfigMap.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "items",
-    "name",
-    "optional"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVPSConfigMap implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVPSConfigMapBuilder> , KubernetesResource
-{
-
-    @JsonProperty("items")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecVPSCMItems> items = new ArrayList<>();
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("optional")
-    private Boolean optional;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSConfigMap() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSConfigMap(List<ClusterServiceVersionSpecISpecDSpecTSpecVPSCMItems> items, String name, Boolean optional) {
-        super();
-        this.items = items;
-        this.name = name;
-        this.optional = optional;
-    }
-
-    @JsonProperty("items")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecVPSCMItems> getItems() {
-        return items;
-    }
-
-    @JsonProperty("items")
-    public void setItems(List<ClusterServiceVersionSpecISpecDSpecTSpecVPSCMItems> items) {
-        this.items = items;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("optional")
-    public Boolean getOptional() {
-        return optional;
-    }
-
-    @JsonProperty("optional")
-    public void setOptional(Boolean optional) {
-        this.optional = optional;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSConfigMapBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVPSConfigMapBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSConfigMapBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVPSDAIFieldRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVPSDAIFieldRef.java
deleted file mode 100644
index d4f8ba1da1e..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVPSDAIFieldRef.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "apiVersion",
-    "fieldPath"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVPSDAIFieldRef implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVPSDAIFieldRefBuilder> , KubernetesResource
-{
-
-    @JsonProperty("apiVersion")
-    private String apiVersion;
-    @JsonProperty("fieldPath")
-    private String fieldPath;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSDAIFieldRef() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSDAIFieldRef(String apiVersion, String fieldPath) {
-        super();
-        this.apiVersion = apiVersion;
-        this.fieldPath = fieldPath;
-    }
-
-    @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;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSDAIFieldRefBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVPSDAIFieldRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSDAIFieldRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVPSDAIResourceFieldRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVPSDAIResourceFieldRef.java
deleted file mode 100644
index 3844e02a119..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVPSDAIResourceFieldRef.java
+++ /dev/null
@@ -1,138 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "containerName",
-    "divisor",
-    "resource"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVPSDAIResourceFieldRef implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVPSDAIResourceFieldRefBuilder> , KubernetesResource
-{
-
-    @JsonProperty("containerName")
-    private String containerName;
-    @JsonProperty("divisor")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object divisor;
-    @JsonProperty("resource")
-    private String resource;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSDAIResourceFieldRef() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSDAIResourceFieldRef(String containerName, Object divisor, String resource) {
-        super();
-        this.containerName = containerName;
-        this.divisor = divisor;
-        this.resource = resource;
-    }
-
-    @JsonProperty("containerName")
-    public String getContainerName() {
-        return containerName;
-    }
-
-    @JsonProperty("containerName")
-    public void setContainerName(String containerName) {
-        this.containerName = containerName;
-    }
-
-    @JsonProperty("divisor")
-    public Object getDivisor() {
-        return divisor;
-    }
-
-    @JsonProperty("divisor")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setDivisor(Object divisor) {
-        this.divisor = divisor;
-    }
-
-    @JsonProperty("resource")
-    public String getResource() {
-        return resource;
-    }
-
-    @JsonProperty("resource")
-    public void setResource(String resource) {
-        this.resource = resource;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSDAIResourceFieldRefBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVPSDAIResourceFieldRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSDAIResourceFieldRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVPSDAItems.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVPSDAItems.java
deleted file mode 100644
index 62534650c18..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVPSDAItems.java
+++ /dev/null
@@ -1,150 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "fieldRef",
-    "mode",
-    "path",
-    "resourceFieldRef"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVPSDAItems implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVPSDAItemsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("fieldRef")
-    private ClusterServiceVersionSpecISpecDSpecTSpecVPSDAIFieldRef fieldRef;
-    @JsonProperty("mode")
-    private Integer mode;
-    @JsonProperty("path")
-    private String path;
-    @JsonProperty("resourceFieldRef")
-    private ClusterServiceVersionSpecISpecDSpecTSpecVPSDAIResourceFieldRef resourceFieldRef;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSDAItems() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSDAItems(ClusterServiceVersionSpecISpecDSpecTSpecVPSDAIFieldRef fieldRef, Integer mode, String path, ClusterServiceVersionSpecISpecDSpecTSpecVPSDAIResourceFieldRef resourceFieldRef) {
-        super();
-        this.fieldRef = fieldRef;
-        this.mode = mode;
-        this.path = path;
-        this.resourceFieldRef = resourceFieldRef;
-    }
-
-    @JsonProperty("fieldRef")
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSDAIFieldRef getFieldRef() {
-        return fieldRef;
-    }
-
-    @JsonProperty("fieldRef")
-    public void setFieldRef(ClusterServiceVersionSpecISpecDSpecTSpecVPSDAIFieldRef fieldRef) {
-        this.fieldRef = fieldRef;
-    }
-
-    @JsonProperty("mode")
-    public Integer getMode() {
-        return mode;
-    }
-
-    @JsonProperty("mode")
-    public void setMode(Integer mode) {
-        this.mode = mode;
-    }
-
-    @JsonProperty("path")
-    public String getPath() {
-        return path;
-    }
-
-    @JsonProperty("path")
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @JsonProperty("resourceFieldRef")
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSDAIResourceFieldRef getResourceFieldRef() {
-        return resourceFieldRef;
-    }
-
-    @JsonProperty("resourceFieldRef")
-    public void setResourceFieldRef(ClusterServiceVersionSpecISpecDSpecTSpecVPSDAIResourceFieldRef resourceFieldRef) {
-        this.resourceFieldRef = resourceFieldRef;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSDAItemsBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVPSDAItemsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSDAItemsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVPSDownwardAPI.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVPSDownwardAPI.java
deleted file mode 100644
index bcb3c072d24..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVPSDownwardAPI.java
+++ /dev/null
@@ -1,112 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "items"
-})
-@ToString
-@EqualsAndHashCode
-@Accessors(prefix = {
-    "_",
-    ""
-})
-@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
-    @BuildableReference(ObjectMeta.class),
-    @BuildableReference(LabelSelector.class),
-    @BuildableReference(Container.class),
-    @BuildableReference(PodTemplateSpec.class),
-    @BuildableReference(ResourceRequirements.class),
-    @BuildableReference(IntOrString.class),
-    @BuildableReference(ObjectReference.class),
-    @BuildableReference(LocalObjectReference.class),
-    @BuildableReference(PersistentVolumeClaim.class)
-})
-@Generated("jsonschema2pojo")
-public class ClusterServiceVersionSpecISpecDSpecTSpecVPSDownwardAPI implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVPSDownwardAPIBuilder> , KubernetesResource
-{
-
-    @JsonProperty("items")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecVPSDAItems> items = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSDownwardAPI() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSDownwardAPI(List<ClusterServiceVersionSpecISpecDSpecTSpecVPSDAItems> items) {
-        super();
-        this.items = items;
-    }
-
-    @JsonProperty("items")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecVPSDAItems> getItems() {
-        return items;
-    }
-
-    @JsonProperty("items")
-    public void setItems(List<ClusterServiceVersionSpecISpecDSpecTSpecVPSDAItems> items) {
-        this.items = items;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSDownwardAPIBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVPSDownwardAPIBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSDownwardAPIBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVPSSItems.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVPSSItems.java
deleted file mode 100644
index 7950de9a112..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVPSSItems.java
+++ /dev/null
@@ -1,136 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "mode",
-    "path"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVPSSItems implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVPSSItemsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("mode")
-    private Integer mode;
-    @JsonProperty("path")
-    private String path;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSSItems() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSSItems(String key, Integer mode, String path) {
-        super();
-        this.key = key;
-        this.mode = mode;
-        this.path = path;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("mode")
-    public Integer getMode() {
-        return mode;
-    }
-
-    @JsonProperty("mode")
-    public void setMode(Integer mode) {
-        this.mode = mode;
-    }
-
-    @JsonProperty("path")
-    public String getPath() {
-        return path;
-    }
-
-    @JsonProperty("path")
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSSItemsBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVPSSItemsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSSItemsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVPSSecret.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVPSSecret.java
deleted file mode 100644
index e0ec98e0619..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVPSSecret.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "items",
-    "name",
-    "optional"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVPSSecret implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVPSSecretBuilder> , KubernetesResource
-{
-
-    @JsonProperty("items")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecVPSSItems> items = new ArrayList<>();
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("optional")
-    private Boolean optional;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSSecret() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSSecret(List<ClusterServiceVersionSpecISpecDSpecTSpecVPSSItems> items, String name, Boolean optional) {
-        super();
-        this.items = items;
-        this.name = name;
-        this.optional = optional;
-    }
-
-    @JsonProperty("items")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecVPSSItems> getItems() {
-        return items;
-    }
-
-    @JsonProperty("items")
-    public void setItems(List<ClusterServiceVersionSpecISpecDSpecTSpecVPSSItems> items) {
-        this.items = items;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("optional")
-    public Boolean getOptional() {
-        return optional;
-    }
-
-    @JsonProperty("optional")
-    public void setOptional(Boolean optional) {
-        this.optional = optional;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSSecretBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVPSSecretBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSSecretBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVPSServiceAccountToken.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVPSServiceAccountToken.java
deleted file mode 100644
index d52bffb053f..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVPSServiceAccountToken.java
+++ /dev/null
@@ -1,136 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "audience",
-    "expirationSeconds",
-    "path"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVPSServiceAccountToken implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVPSServiceAccountTokenBuilder> , KubernetesResource
-{
-
-    @JsonProperty("audience")
-    private String audience;
-    @JsonProperty("expirationSeconds")
-    private Long expirationSeconds;
-    @JsonProperty("path")
-    private String path;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSServiceAccountToken() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSServiceAccountToken(String audience, Long expirationSeconds, String path) {
-        super();
-        this.audience = audience;
-        this.expirationSeconds = expirationSeconds;
-        this.path = path;
-    }
-
-    @JsonProperty("audience")
-    public String getAudience() {
-        return audience;
-    }
-
-    @JsonProperty("audience")
-    public void setAudience(String audience) {
-        this.audience = audience;
-    }
-
-    @JsonProperty("expirationSeconds")
-    public Long getExpirationSeconds() {
-        return expirationSeconds;
-    }
-
-    @JsonProperty("expirationSeconds")
-    public void setExpirationSeconds(Long expirationSeconds) {
-        this.expirationSeconds = expirationSeconds;
-    }
-
-    @JsonProperty("path")
-    public String getPath() {
-        return path;
-    }
-
-    @JsonProperty("path")
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSServiceAccountTokenBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVPSServiceAccountTokenBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSServiceAccountTokenBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVPSources.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVPSources.java
deleted file mode 100644
index 0ca377c3a74..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVPSources.java
+++ /dev/null
@@ -1,164 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "clusterTrustBundle",
-    "configMap",
-    "downwardAPI",
-    "secret",
-    "serviceAccountToken"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVPSources implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVPSourcesBuilder> , KubernetesResource
-{
-
-    @JsonProperty("clusterTrustBundle")
-    private ClusterServiceVersionSpecISpecDSpecTSpecVPSClusterTrustBundle clusterTrustBundle;
-    @JsonProperty("configMap")
-    private ClusterServiceVersionSpecISpecDSpecTSpecVPSConfigMap configMap;
-    @JsonProperty("downwardAPI")
-    private ClusterServiceVersionSpecISpecDSpecTSpecVPSDownwardAPI downwardAPI;
-    @JsonProperty("secret")
-    private ClusterServiceVersionSpecISpecDSpecTSpecVPSSecret secret;
-    @JsonProperty("serviceAccountToken")
-    private ClusterServiceVersionSpecISpecDSpecTSpecVPSServiceAccountToken serviceAccountToken;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSources() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSources(ClusterServiceVersionSpecISpecDSpecTSpecVPSClusterTrustBundle clusterTrustBundle, ClusterServiceVersionSpecISpecDSpecTSpecVPSConfigMap configMap, ClusterServiceVersionSpecISpecDSpecTSpecVPSDownwardAPI downwardAPI, ClusterServiceVersionSpecISpecDSpecTSpecVPSSecret secret, ClusterServiceVersionSpecISpecDSpecTSpecVPSServiceAccountToken serviceAccountToken) {
-        super();
-        this.clusterTrustBundle = clusterTrustBundle;
-        this.configMap = configMap;
-        this.downwardAPI = downwardAPI;
-        this.secret = secret;
-        this.serviceAccountToken = serviceAccountToken;
-    }
-
-    @JsonProperty("clusterTrustBundle")
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSClusterTrustBundle getClusterTrustBundle() {
-        return clusterTrustBundle;
-    }
-
-    @JsonProperty("clusterTrustBundle")
-    public void setClusterTrustBundle(ClusterServiceVersionSpecISpecDSpecTSpecVPSClusterTrustBundle clusterTrustBundle) {
-        this.clusterTrustBundle = clusterTrustBundle;
-    }
-
-    @JsonProperty("configMap")
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSConfigMap getConfigMap() {
-        return configMap;
-    }
-
-    @JsonProperty("configMap")
-    public void setConfigMap(ClusterServiceVersionSpecISpecDSpecTSpecVPSConfigMap configMap) {
-        this.configMap = configMap;
-    }
-
-    @JsonProperty("downwardAPI")
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSDownwardAPI getDownwardAPI() {
-        return downwardAPI;
-    }
-
-    @JsonProperty("downwardAPI")
-    public void setDownwardAPI(ClusterServiceVersionSpecISpecDSpecTSpecVPSDownwardAPI downwardAPI) {
-        this.downwardAPI = downwardAPI;
-    }
-
-    @JsonProperty("secret")
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSSecret getSecret() {
-        return secret;
-    }
-
-    @JsonProperty("secret")
-    public void setSecret(ClusterServiceVersionSpecISpecDSpecTSpecVPSSecret secret) {
-        this.secret = secret;
-    }
-
-    @JsonProperty("serviceAccountToken")
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSServiceAccountToken getServiceAccountToken() {
-        return serviceAccountToken;
-    }
-
-    @JsonProperty("serviceAccountToken")
-    public void setServiceAccountToken(ClusterServiceVersionSpecISpecDSpecTSpecVPSServiceAccountToken serviceAccountToken) {
-        this.serviceAccountToken = serviceAccountToken;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSourcesBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVPSourcesBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPSourcesBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVPersistentVolumeClaim.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVPersistentVolumeClaim.java
deleted file mode 100644
index 55003a14202..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVPersistentVolumeClaim.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "claimName",
-    "readOnly"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVPersistentVolumeClaim implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVPersistentVolumeClaimBuilder> , KubernetesResource
-{
-
-    @JsonProperty("claimName")
-    private String claimName;
-    @JsonProperty("readOnly")
-    private Boolean readOnly;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPersistentVolumeClaim() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPersistentVolumeClaim(String claimName, Boolean readOnly) {
-        super();
-        this.claimName = claimName;
-        this.readOnly = readOnly;
-    }
-
-    @JsonProperty("claimName")
-    public String getClaimName() {
-        return claimName;
-    }
-
-    @JsonProperty("claimName")
-    public void setClaimName(String claimName) {
-        this.claimName = claimName;
-    }
-
-    @JsonProperty("readOnly")
-    public Boolean getReadOnly() {
-        return readOnly;
-    }
-
-    @JsonProperty("readOnly")
-    public void setReadOnly(Boolean readOnly) {
-        this.readOnly = readOnly;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPersistentVolumeClaimBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVPersistentVolumeClaimBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPersistentVolumeClaimBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVPhotonPersistentDisk.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVPhotonPersistentDisk.java
deleted file mode 100644
index df9205c6488..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVPhotonPersistentDisk.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "fsType",
-    "pdID"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVPhotonPersistentDisk implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVPhotonPersistentDiskBuilder> , KubernetesResource
-{
-
-    @JsonProperty("fsType")
-    private String fsType;
-    @JsonProperty("pdID")
-    private String pdID;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPhotonPersistentDisk() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPhotonPersistentDisk(String fsType, String pdID) {
-        super();
-        this.fsType = fsType;
-        this.pdID = pdID;
-    }
-
-    @JsonProperty("fsType")
-    public String getFsType() {
-        return fsType;
-    }
-
-    @JsonProperty("fsType")
-    public void setFsType(String fsType) {
-        this.fsType = fsType;
-    }
-
-    @JsonProperty("pdID")
-    public String getPdID() {
-        return pdID;
-    }
-
-    @JsonProperty("pdID")
-    public void setPdID(String pdID) {
-        this.pdID = pdID;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPhotonPersistentDiskBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVPhotonPersistentDiskBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPhotonPersistentDiskBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVPortworxVolume.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVPortworxVolume.java
deleted file mode 100644
index a4fc0643654..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVPortworxVolume.java
+++ /dev/null
@@ -1,136 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "fsType",
-    "readOnly",
-    "volumeID"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVPortworxVolume implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVPortworxVolumeBuilder> , KubernetesResource
-{
-
-    @JsonProperty("fsType")
-    private String fsType;
-    @JsonProperty("readOnly")
-    private Boolean readOnly;
-    @JsonProperty("volumeID")
-    private String volumeID;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPortworxVolume() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPortworxVolume(String fsType, Boolean readOnly, String volumeID) {
-        super();
-        this.fsType = fsType;
-        this.readOnly = readOnly;
-        this.volumeID = volumeID;
-    }
-
-    @JsonProperty("fsType")
-    public String getFsType() {
-        return fsType;
-    }
-
-    @JsonProperty("fsType")
-    public void setFsType(String fsType) {
-        this.fsType = fsType;
-    }
-
-    @JsonProperty("readOnly")
-    public Boolean getReadOnly() {
-        return readOnly;
-    }
-
-    @JsonProperty("readOnly")
-    public void setReadOnly(Boolean readOnly) {
-        this.readOnly = readOnly;
-    }
-
-    @JsonProperty("volumeID")
-    public String getVolumeID() {
-        return volumeID;
-    }
-
-    @JsonProperty("volumeID")
-    public void setVolumeID(String volumeID) {
-        this.volumeID = volumeID;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPortworxVolumeBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVPortworxVolumeBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPortworxVolumeBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVProjected.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVProjected.java
deleted file mode 100644
index 191a1c11a28..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVProjected.java
+++ /dev/null
@@ -1,126 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "defaultMode",
-    "sources"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVProjected implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVProjectedBuilder> , KubernetesResource
-{
-
-    @JsonProperty("defaultMode")
-    private Integer defaultMode;
-    @JsonProperty("sources")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecVPSources> sources = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVProjected() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVProjected(Integer defaultMode, List<ClusterServiceVersionSpecISpecDSpecTSpecVPSources> sources) {
-        super();
-        this.defaultMode = defaultMode;
-        this.sources = sources;
-    }
-
-    @JsonProperty("defaultMode")
-    public Integer getDefaultMode() {
-        return defaultMode;
-    }
-
-    @JsonProperty("defaultMode")
-    public void setDefaultMode(Integer defaultMode) {
-        this.defaultMode = defaultMode;
-    }
-
-    @JsonProperty("sources")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecVPSources> getSources() {
-        return sources;
-    }
-
-    @JsonProperty("sources")
-    public void setSources(List<ClusterServiceVersionSpecISpecDSpecTSpecVPSources> sources) {
-        this.sources = sources;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVProjectedBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVProjectedBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVProjectedBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVQuobyte.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVQuobyte.java
deleted file mode 100644
index 7e3f1f8aade..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVQuobyte.java
+++ /dev/null
@@ -1,178 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "group",
-    "readOnly",
-    "registry",
-    "tenant",
-    "user",
-    "volume"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVQuobyte implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVQuobyteBuilder> , KubernetesResource
-{
-
-    @JsonProperty("group")
-    private String group;
-    @JsonProperty("readOnly")
-    private Boolean readOnly;
-    @JsonProperty("registry")
-    private String registry;
-    @JsonProperty("tenant")
-    private String tenant;
-    @JsonProperty("user")
-    private String user;
-    @JsonProperty("volume")
-    private String volume;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVQuobyte() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVQuobyte(String group, Boolean readOnly, String registry, String tenant, String user, String volume) {
-        super();
-        this.group = group;
-        this.readOnly = readOnly;
-        this.registry = registry;
-        this.tenant = tenant;
-        this.user = user;
-        this.volume = volume;
-    }
-
-    @JsonProperty("group")
-    public String getGroup() {
-        return group;
-    }
-
-    @JsonProperty("group")
-    public void setGroup(String group) {
-        this.group = group;
-    }
-
-    @JsonProperty("readOnly")
-    public Boolean getReadOnly() {
-        return readOnly;
-    }
-
-    @JsonProperty("readOnly")
-    public void setReadOnly(Boolean readOnly) {
-        this.readOnly = readOnly;
-    }
-
-    @JsonProperty("registry")
-    public String getRegistry() {
-        return registry;
-    }
-
-    @JsonProperty("registry")
-    public void setRegistry(String registry) {
-        this.registry = registry;
-    }
-
-    @JsonProperty("tenant")
-    public String getTenant() {
-        return tenant;
-    }
-
-    @JsonProperty("tenant")
-    public void setTenant(String tenant) {
-        this.tenant = tenant;
-    }
-
-    @JsonProperty("user")
-    public String getUser() {
-        return user;
-    }
-
-    @JsonProperty("user")
-    public void setUser(String user) {
-        this.user = user;
-    }
-
-    @JsonProperty("volume")
-    public String getVolume() {
-        return volume;
-    }
-
-    @JsonProperty("volume")
-    public void setVolume(String volume) {
-        this.volume = volume;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVQuobyteBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVQuobyteBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVQuobyteBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVRSecretRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVRSecretRef.java
deleted file mode 100644
index 3e18965bc90..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVRSecretRef.java
+++ /dev/null
@@ -1,108 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVRSecretRef implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVRSecretRefBuilder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVRSecretRef() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVRSecretRef(String name) {
-        super();
-        this.name = name;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVRSecretRefBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVRSecretRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVRSecretRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVRbd.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVRbd.java
deleted file mode 100644
index b70b999b1ab..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVRbd.java
+++ /dev/null
@@ -1,210 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "fsType",
-    "image",
-    "keyring",
-    "monitors",
-    "pool",
-    "readOnly",
-    "secretRef",
-    "user"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVRbd implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVRbdBuilder> , KubernetesResource
-{
-
-    @JsonProperty("fsType")
-    private String fsType;
-    @JsonProperty("image")
-    private String image;
-    @JsonProperty("keyring")
-    private String keyring;
-    @JsonProperty("monitors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> monitors = new ArrayList<>();
-    @JsonProperty("pool")
-    private String pool;
-    @JsonProperty("readOnly")
-    private Boolean readOnly;
-    @JsonProperty("secretRef")
-    private ClusterServiceVersionSpecISpecDSpecTSpecVRSecretRef secretRef;
-    @JsonProperty("user")
-    private String user;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVRbd() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVRbd(String fsType, String image, String keyring, List<String> monitors, String pool, Boolean readOnly, ClusterServiceVersionSpecISpecDSpecTSpecVRSecretRef secretRef, String user) {
-        super();
-        this.fsType = fsType;
-        this.image = image;
-        this.keyring = keyring;
-        this.monitors = monitors;
-        this.pool = pool;
-        this.readOnly = readOnly;
-        this.secretRef = secretRef;
-        this.user = user;
-    }
-
-    @JsonProperty("fsType")
-    public String getFsType() {
-        return fsType;
-    }
-
-    @JsonProperty("fsType")
-    public void setFsType(String fsType) {
-        this.fsType = fsType;
-    }
-
-    @JsonProperty("image")
-    public String getImage() {
-        return image;
-    }
-
-    @JsonProperty("image")
-    public void setImage(String image) {
-        this.image = image;
-    }
-
-    @JsonProperty("keyring")
-    public String getKeyring() {
-        return keyring;
-    }
-
-    @JsonProperty("keyring")
-    public void setKeyring(String keyring) {
-        this.keyring = keyring;
-    }
-
-    @JsonProperty("monitors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getMonitors() {
-        return monitors;
-    }
-
-    @JsonProperty("monitors")
-    public void setMonitors(List<String> monitors) {
-        this.monitors = monitors;
-    }
-
-    @JsonProperty("pool")
-    public String getPool() {
-        return pool;
-    }
-
-    @JsonProperty("pool")
-    public void setPool(String pool) {
-        this.pool = pool;
-    }
-
-    @JsonProperty("readOnly")
-    public Boolean getReadOnly() {
-        return readOnly;
-    }
-
-    @JsonProperty("readOnly")
-    public void setReadOnly(Boolean readOnly) {
-        this.readOnly = readOnly;
-    }
-
-    @JsonProperty("secretRef")
-    public ClusterServiceVersionSpecISpecDSpecTSpecVRSecretRef getSecretRef() {
-        return secretRef;
-    }
-
-    @JsonProperty("secretRef")
-    public void setSecretRef(ClusterServiceVersionSpecISpecDSpecTSpecVRSecretRef secretRef) {
-        this.secretRef = secretRef;
-    }
-
-    @JsonProperty("user")
-    public String getUser() {
-        return user;
-    }
-
-    @JsonProperty("user")
-    public void setUser(String user) {
-        this.user = user;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVRbdBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVRbdBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVRbdBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVSISecretRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVSISecretRef.java
deleted file mode 100644
index 6739b915f95..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVSISecretRef.java
+++ /dev/null
@@ -1,108 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVSISecretRef implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVSISecretRefBuilder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVSISecretRef() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVSISecretRef(String name) {
-        super();
-        this.name = name;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVSISecretRefBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVSISecretRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVSISecretRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVSItems.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVSItems.java
deleted file mode 100644
index 445f6ab0af2..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVSItems.java
+++ /dev/null
@@ -1,136 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "mode",
-    "path"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVSItems implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVSItemsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("mode")
-    private Integer mode;
-    @JsonProperty("path")
-    private String path;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVSItems() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVSItems(String key, Integer mode, String path) {
-        super();
-        this.key = key;
-        this.mode = mode;
-        this.path = path;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("mode")
-    public Integer getMode() {
-        return mode;
-    }
-
-    @JsonProperty("mode")
-    public void setMode(Integer mode) {
-        this.mode = mode;
-    }
-
-    @JsonProperty("path")
-    public String getPath() {
-        return path;
-    }
-
-    @JsonProperty("path")
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVSItemsBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVSItemsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVSItemsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVSSecretRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVSSecretRef.java
deleted file mode 100644
index d972249a00d..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVSSecretRef.java
+++ /dev/null
@@ -1,108 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVSSecretRef implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVSSecretRefBuilder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVSSecretRef() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVSSecretRef(String name) {
-        super();
-        this.name = name;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVSSecretRefBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVSSecretRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVSSecretRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVScaleIO.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVScaleIO.java
deleted file mode 100644
index 7d9dc0b7838..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVScaleIO.java
+++ /dev/null
@@ -1,234 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "fsType",
-    "gateway",
-    "protectionDomain",
-    "readOnly",
-    "secretRef",
-    "sslEnabled",
-    "storageMode",
-    "storagePool",
-    "system",
-    "volumeName"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVScaleIO implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVScaleIOBuilder> , KubernetesResource
-{
-
-    @JsonProperty("fsType")
-    private String fsType;
-    @JsonProperty("gateway")
-    private String gateway;
-    @JsonProperty("protectionDomain")
-    private String protectionDomain;
-    @JsonProperty("readOnly")
-    private Boolean readOnly;
-    @JsonProperty("secretRef")
-    private ClusterServiceVersionSpecISpecDSpecTSpecVSISecretRef secretRef;
-    @JsonProperty("sslEnabled")
-    private Boolean sslEnabled;
-    @JsonProperty("storageMode")
-    private String storageMode;
-    @JsonProperty("storagePool")
-    private String storagePool;
-    @JsonProperty("system")
-    private String system;
-    @JsonProperty("volumeName")
-    private String volumeName;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVScaleIO() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVScaleIO(String fsType, String gateway, String protectionDomain, Boolean readOnly, ClusterServiceVersionSpecISpecDSpecTSpecVSISecretRef secretRef, Boolean sslEnabled, String storageMode, String storagePool, String system, String volumeName) {
-        super();
-        this.fsType = fsType;
-        this.gateway = gateway;
-        this.protectionDomain = protectionDomain;
-        this.readOnly = readOnly;
-        this.secretRef = secretRef;
-        this.sslEnabled = sslEnabled;
-        this.storageMode = storageMode;
-        this.storagePool = storagePool;
-        this.system = system;
-        this.volumeName = volumeName;
-    }
-
-    @JsonProperty("fsType")
-    public String getFsType() {
-        return fsType;
-    }
-
-    @JsonProperty("fsType")
-    public void setFsType(String fsType) {
-        this.fsType = fsType;
-    }
-
-    @JsonProperty("gateway")
-    public String getGateway() {
-        return gateway;
-    }
-
-    @JsonProperty("gateway")
-    public void setGateway(String gateway) {
-        this.gateway = gateway;
-    }
-
-    @JsonProperty("protectionDomain")
-    public String getProtectionDomain() {
-        return protectionDomain;
-    }
-
-    @JsonProperty("protectionDomain")
-    public void setProtectionDomain(String protectionDomain) {
-        this.protectionDomain = protectionDomain;
-    }
-
-    @JsonProperty("readOnly")
-    public Boolean getReadOnly() {
-        return readOnly;
-    }
-
-    @JsonProperty("readOnly")
-    public void setReadOnly(Boolean readOnly) {
-        this.readOnly = readOnly;
-    }
-
-    @JsonProperty("secretRef")
-    public ClusterServiceVersionSpecISpecDSpecTSpecVSISecretRef getSecretRef() {
-        return secretRef;
-    }
-
-    @JsonProperty("secretRef")
-    public void setSecretRef(ClusterServiceVersionSpecISpecDSpecTSpecVSISecretRef secretRef) {
-        this.secretRef = secretRef;
-    }
-
-    @JsonProperty("sslEnabled")
-    public Boolean getSslEnabled() {
-        return sslEnabled;
-    }
-
-    @JsonProperty("sslEnabled")
-    public void setSslEnabled(Boolean sslEnabled) {
-        this.sslEnabled = sslEnabled;
-    }
-
-    @JsonProperty("storageMode")
-    public String getStorageMode() {
-        return storageMode;
-    }
-
-    @JsonProperty("storageMode")
-    public void setStorageMode(String storageMode) {
-        this.storageMode = storageMode;
-    }
-
-    @JsonProperty("storagePool")
-    public String getStoragePool() {
-        return storagePool;
-    }
-
-    @JsonProperty("storagePool")
-    public void setStoragePool(String storagePool) {
-        this.storagePool = storagePool;
-    }
-
-    @JsonProperty("system")
-    public String getSystem() {
-        return system;
-    }
-
-    @JsonProperty("system")
-    public void setSystem(String system) {
-        this.system = system;
-    }
-
-    @JsonProperty("volumeName")
-    public String getVolumeName() {
-        return volumeName;
-    }
-
-    @JsonProperty("volumeName")
-    public void setVolumeName(String volumeName) {
-        this.volumeName = volumeName;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVScaleIOBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVScaleIOBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVScaleIOBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVSecret.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVSecret.java
deleted file mode 100644
index 08c11647045..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVSecret.java
+++ /dev/null
@@ -1,154 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "defaultMode",
-    "items",
-    "optional",
-    "secretName"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVSecret implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVSecretBuilder> , KubernetesResource
-{
-
-    @JsonProperty("defaultMode")
-    private Integer defaultMode;
-    @JsonProperty("items")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDSpecTSpecVSItems> items = new ArrayList<>();
-    @JsonProperty("optional")
-    private Boolean optional;
-    @JsonProperty("secretName")
-    private String secretName;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVSecret() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVSecret(Integer defaultMode, List<ClusterServiceVersionSpecISpecDSpecTSpecVSItems> items, Boolean optional, String secretName) {
-        super();
-        this.defaultMode = defaultMode;
-        this.items = items;
-        this.optional = optional;
-        this.secretName = secretName;
-    }
-
-    @JsonProperty("defaultMode")
-    public Integer getDefaultMode() {
-        return defaultMode;
-    }
-
-    @JsonProperty("defaultMode")
-    public void setDefaultMode(Integer defaultMode) {
-        this.defaultMode = defaultMode;
-    }
-
-    @JsonProperty("items")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDSpecTSpecVSItems> getItems() {
-        return items;
-    }
-
-    @JsonProperty("items")
-    public void setItems(List<ClusterServiceVersionSpecISpecDSpecTSpecVSItems> items) {
-        this.items = items;
-    }
-
-    @JsonProperty("optional")
-    public Boolean getOptional() {
-        return optional;
-    }
-
-    @JsonProperty("optional")
-    public void setOptional(Boolean optional) {
-        this.optional = optional;
-    }
-
-    @JsonProperty("secretName")
-    public String getSecretName() {
-        return secretName;
-    }
-
-    @JsonProperty("secretName")
-    public void setSecretName(String secretName) {
-        this.secretName = secretName;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVSecretBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVSecretBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVSecretBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVStorageos.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVStorageos.java
deleted file mode 100644
index 562a8ff6ff6..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVStorageos.java
+++ /dev/null
@@ -1,164 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "fsType",
-    "readOnly",
-    "secretRef",
-    "volumeName",
-    "volumeNamespace"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVStorageos implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVStorageosBuilder> , KubernetesResource
-{
-
-    @JsonProperty("fsType")
-    private String fsType;
-    @JsonProperty("readOnly")
-    private Boolean readOnly;
-    @JsonProperty("secretRef")
-    private ClusterServiceVersionSpecISpecDSpecTSpecVSSecretRef secretRef;
-    @JsonProperty("volumeName")
-    private String volumeName;
-    @JsonProperty("volumeNamespace")
-    private String volumeNamespace;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVStorageos() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVStorageos(String fsType, Boolean readOnly, ClusterServiceVersionSpecISpecDSpecTSpecVSSecretRef secretRef, String volumeName, String volumeNamespace) {
-        super();
-        this.fsType = fsType;
-        this.readOnly = readOnly;
-        this.secretRef = secretRef;
-        this.volumeName = volumeName;
-        this.volumeNamespace = volumeNamespace;
-    }
-
-    @JsonProperty("fsType")
-    public String getFsType() {
-        return fsType;
-    }
-
-    @JsonProperty("fsType")
-    public void setFsType(String fsType) {
-        this.fsType = fsType;
-    }
-
-    @JsonProperty("readOnly")
-    public Boolean getReadOnly() {
-        return readOnly;
-    }
-
-    @JsonProperty("readOnly")
-    public void setReadOnly(Boolean readOnly) {
-        this.readOnly = readOnly;
-    }
-
-    @JsonProperty("secretRef")
-    public ClusterServiceVersionSpecISpecDSpecTSpecVSSecretRef getSecretRef() {
-        return secretRef;
-    }
-
-    @JsonProperty("secretRef")
-    public void setSecretRef(ClusterServiceVersionSpecISpecDSpecTSpecVSSecretRef secretRef) {
-        this.secretRef = secretRef;
-    }
-
-    @JsonProperty("volumeName")
-    public String getVolumeName() {
-        return volumeName;
-    }
-
-    @JsonProperty("volumeName")
-    public void setVolumeName(String volumeName) {
-        this.volumeName = volumeName;
-    }
-
-    @JsonProperty("volumeNamespace")
-    public String getVolumeNamespace() {
-        return volumeNamespace;
-    }
-
-    @JsonProperty("volumeNamespace")
-    public void setVolumeNamespace(String volumeNamespace) {
-        this.volumeNamespace = volumeNamespace;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVStorageosBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVStorageosBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVStorageosBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVVsphereVolume.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVVsphereVolume.java
deleted file mode 100644
index 823ae17ed91..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVVsphereVolume.java
+++ /dev/null
@@ -1,150 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "fsType",
-    "storagePolicyID",
-    "storagePolicyName",
-    "volumePath"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVVsphereVolume implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVVsphereVolumeBuilder> , KubernetesResource
-{
-
-    @JsonProperty("fsType")
-    private String fsType;
-    @JsonProperty("storagePolicyID")
-    private String storagePolicyID;
-    @JsonProperty("storagePolicyName")
-    private String storagePolicyName;
-    @JsonProperty("volumePath")
-    private String volumePath;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVVsphereVolume() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVVsphereVolume(String fsType, String storagePolicyID, String storagePolicyName, String volumePath) {
-        super();
-        this.fsType = fsType;
-        this.storagePolicyID = storagePolicyID;
-        this.storagePolicyName = storagePolicyName;
-        this.volumePath = volumePath;
-    }
-
-    @JsonProperty("fsType")
-    public String getFsType() {
-        return fsType;
-    }
-
-    @JsonProperty("fsType")
-    public void setFsType(String fsType) {
-        this.fsType = fsType;
-    }
-
-    @JsonProperty("storagePolicyID")
-    public String getStoragePolicyID() {
-        return storagePolicyID;
-    }
-
-    @JsonProperty("storagePolicyID")
-    public void setStoragePolicyID(String storagePolicyID) {
-        this.storagePolicyID = storagePolicyID;
-    }
-
-    @JsonProperty("storagePolicyName")
-    public String getStoragePolicyName() {
-        return storagePolicyName;
-    }
-
-    @JsonProperty("storagePolicyName")
-    public void setStoragePolicyName(String storagePolicyName) {
-        this.storagePolicyName = storagePolicyName;
-    }
-
-    @JsonProperty("volumePath")
-    public String getVolumePath() {
-        return volumePath;
-    }
-
-    @JsonProperty("volumePath")
-    public void setVolumePath(String volumePath) {
-        this.volumePath = volumePath;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVVsphereVolumeBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVVsphereVolumeBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVVsphereVolumeBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVolumes.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVolumes.java
deleted file mode 100644
index 6ae30cf8643..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTSpecVolumes.java
+++ /dev/null
@@ -1,514 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "awsElasticBlockStore",
-    "azureDisk",
-    "azureFile",
-    "cephfs",
-    "cinder",
-    "configMap",
-    "csi",
-    "downwardAPI",
-    "emptyDir",
-    "ephemeral",
-    "fc",
-    "flexVolume",
-    "flocker",
-    "gcePersistentDisk",
-    "gitRepo",
-    "glusterfs",
-    "hostPath",
-    "iscsi",
-    "name",
-    "nfs",
-    "persistentVolumeClaim",
-    "photonPersistentDisk",
-    "portworxVolume",
-    "projected",
-    "quobyte",
-    "rbd",
-    "scaleIO",
-    "secret",
-    "storageos",
-    "vsphereVolume"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTSpecVolumes implements Editable<ClusterServiceVersionSpecISpecDSpecTSpecVolumesBuilder> , KubernetesResource
-{
-
-    @JsonProperty("awsElasticBlockStore")
-    private ClusterServiceVersionSpecISpecDSpecTSpecVAwsElasticBlockStore awsElasticBlockStore;
-    @JsonProperty("azureDisk")
-    private ClusterServiceVersionSpecISpecDSpecTSpecVAzureDisk azureDisk;
-    @JsonProperty("azureFile")
-    private ClusterServiceVersionSpecISpecDSpecTSpecVAzureFile azureFile;
-    @JsonProperty("cephfs")
-    private ClusterServiceVersionSpecISpecDSpecTSpecVCephfs cephfs;
-    @JsonProperty("cinder")
-    private ClusterServiceVersionSpecISpecDSpecTSpecVCinder cinder;
-    @JsonProperty("configMap")
-    private ClusterServiceVersionSpecISpecDSpecTSpecVConfigMap configMap;
-    @JsonProperty("csi")
-    private ClusterServiceVersionSpecISpecDSpecTSpecVCsi csi;
-    @JsonProperty("downwardAPI")
-    private ClusterServiceVersionSpecISpecDSpecTSpecVDownwardAPI downwardAPI;
-    @JsonProperty("emptyDir")
-    private ClusterServiceVersionSpecISpecDSpecTSpecVEmptyDir emptyDir;
-    @JsonProperty("ephemeral")
-    private ClusterServiceVersionSpecISpecDSpecTSpecVEphemeral ephemeral;
-    @JsonProperty("fc")
-    private ClusterServiceVersionSpecISpecDSpecTSpecVFc fc;
-    @JsonProperty("flexVolume")
-    private ClusterServiceVersionSpecISpecDSpecTSpecVFlexVolume flexVolume;
-    @JsonProperty("flocker")
-    private ClusterServiceVersionSpecISpecDSpecTSpecVFlocker flocker;
-    @JsonProperty("gcePersistentDisk")
-    private ClusterServiceVersionSpecISpecDSpecTSpecVGcePersistentDisk gcePersistentDisk;
-    @JsonProperty("gitRepo")
-    private ClusterServiceVersionSpecISpecDSpecTSpecVGitRepo gitRepo;
-    @JsonProperty("glusterfs")
-    private ClusterServiceVersionSpecISpecDSpecTSpecVGlusterfs glusterfs;
-    @JsonProperty("hostPath")
-    private ClusterServiceVersionSpecISpecDSpecTSpecVHostPath hostPath;
-    @JsonProperty("iscsi")
-    private ClusterServiceVersionSpecISpecDSpecTSpecVIscsi iscsi;
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("nfs")
-    private ClusterServiceVersionSpecISpecDSpecTSpecVNfs nfs;
-    @JsonProperty("persistentVolumeClaim")
-    private ClusterServiceVersionSpecISpecDSpecTSpecVPersistentVolumeClaim persistentVolumeClaim;
-    @JsonProperty("photonPersistentDisk")
-    private ClusterServiceVersionSpecISpecDSpecTSpecVPhotonPersistentDisk photonPersistentDisk;
-    @JsonProperty("portworxVolume")
-    private ClusterServiceVersionSpecISpecDSpecTSpecVPortworxVolume portworxVolume;
-    @JsonProperty("projected")
-    private ClusterServiceVersionSpecISpecDSpecTSpecVProjected projected;
-    @JsonProperty("quobyte")
-    private ClusterServiceVersionSpecISpecDSpecTSpecVQuobyte quobyte;
-    @JsonProperty("rbd")
-    private ClusterServiceVersionSpecISpecDSpecTSpecVRbd rbd;
-    @JsonProperty("scaleIO")
-    private ClusterServiceVersionSpecISpecDSpecTSpecVScaleIO scaleIO;
-    @JsonProperty("secret")
-    private ClusterServiceVersionSpecISpecDSpecTSpecVSecret secret;
-    @JsonProperty("storageos")
-    private ClusterServiceVersionSpecISpecDSpecTSpecVStorageos storageos;
-    @JsonProperty("vsphereVolume")
-    private ClusterServiceVersionSpecISpecDSpecTSpecVVsphereVolume vsphereVolume;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTSpecVolumes() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTSpecVolumes(ClusterServiceVersionSpecISpecDSpecTSpecVAwsElasticBlockStore awsElasticBlockStore, ClusterServiceVersionSpecISpecDSpecTSpecVAzureDisk azureDisk, ClusterServiceVersionSpecISpecDSpecTSpecVAzureFile azureFile, ClusterServiceVersionSpecISpecDSpecTSpecVCephfs cephfs, ClusterServiceVersionSpecISpecDSpecTSpecVCinder cinder, ClusterServiceVersionSpecISpecDSpecTSpecVConfigMap configMap, ClusterServiceVersionSpecISpecDSpecTSpecVCsi csi, ClusterServiceVersionSpecISpecDSpecTSpecVDownwardAPI downwardAPI, ClusterServiceVersionSpecISpecDSpecTSpecVEmptyDir emptyDir, ClusterServiceVersionSpecISpecDSpecTSpecVEphemeral ephemeral, ClusterServiceVersionSpecISpecDSpecTSpecVFc fc, ClusterServiceVersionSpecISpecDSpecTSpecVFlexVolume flexVolume, ClusterServiceVersionSpecISpecDSpecTSpecVFlocker flocker, ClusterServiceVersionSpecISpecDSpecTSpecVGcePersistentDisk gcePersistentDisk, ClusterServiceVersionSpecISpecDSpecTSpecVGitRepo gitRepo, ClusterServiceVersionSpecISpecDSpecTSpecVGlusterfs glusterfs, ClusterServiceVersionSpecISpecDSpecTSpecVHostPath hostPath, ClusterServiceVersionSpecISpecDSpecTSpecVIscsi iscsi, String name, ClusterServiceVersionSpecISpecDSpecTSpecVNfs nfs, ClusterServiceVersionSpecISpecDSpecTSpecVPersistentVolumeClaim persistentVolumeClaim, ClusterServiceVersionSpecISpecDSpecTSpecVPhotonPersistentDisk photonPersistentDisk, ClusterServiceVersionSpecISpecDSpecTSpecVPortworxVolume portworxVolume, ClusterServiceVersionSpecISpecDSpecTSpecVProjected projected, ClusterServiceVersionSpecISpecDSpecTSpecVQuobyte quobyte, ClusterServiceVersionSpecISpecDSpecTSpecVRbd rbd, ClusterServiceVersionSpecISpecDSpecTSpecVScaleIO scaleIO, ClusterServiceVersionSpecISpecDSpecTSpecVSecret secret, ClusterServiceVersionSpecISpecDSpecTSpecVStorageos storageos, ClusterServiceVersionSpecISpecDSpecTSpecVVsphereVolume vsphereVolume) {
-        super();
-        this.awsElasticBlockStore = awsElasticBlockStore;
-        this.azureDisk = azureDisk;
-        this.azureFile = azureFile;
-        this.cephfs = cephfs;
-        this.cinder = cinder;
-        this.configMap = configMap;
-        this.csi = csi;
-        this.downwardAPI = downwardAPI;
-        this.emptyDir = emptyDir;
-        this.ephemeral = ephemeral;
-        this.fc = fc;
-        this.flexVolume = flexVolume;
-        this.flocker = flocker;
-        this.gcePersistentDisk = gcePersistentDisk;
-        this.gitRepo = gitRepo;
-        this.glusterfs = glusterfs;
-        this.hostPath = hostPath;
-        this.iscsi = iscsi;
-        this.name = name;
-        this.nfs = nfs;
-        this.persistentVolumeClaim = persistentVolumeClaim;
-        this.photonPersistentDisk = photonPersistentDisk;
-        this.portworxVolume = portworxVolume;
-        this.projected = projected;
-        this.quobyte = quobyte;
-        this.rbd = rbd;
-        this.scaleIO = scaleIO;
-        this.secret = secret;
-        this.storageos = storageos;
-        this.vsphereVolume = vsphereVolume;
-    }
-
-    @JsonProperty("awsElasticBlockStore")
-    public ClusterServiceVersionSpecISpecDSpecTSpecVAwsElasticBlockStore getAwsElasticBlockStore() {
-        return awsElasticBlockStore;
-    }
-
-    @JsonProperty("awsElasticBlockStore")
-    public void setAwsElasticBlockStore(ClusterServiceVersionSpecISpecDSpecTSpecVAwsElasticBlockStore awsElasticBlockStore) {
-        this.awsElasticBlockStore = awsElasticBlockStore;
-    }
-
-    @JsonProperty("azureDisk")
-    public ClusterServiceVersionSpecISpecDSpecTSpecVAzureDisk getAzureDisk() {
-        return azureDisk;
-    }
-
-    @JsonProperty("azureDisk")
-    public void setAzureDisk(ClusterServiceVersionSpecISpecDSpecTSpecVAzureDisk azureDisk) {
-        this.azureDisk = azureDisk;
-    }
-
-    @JsonProperty("azureFile")
-    public ClusterServiceVersionSpecISpecDSpecTSpecVAzureFile getAzureFile() {
-        return azureFile;
-    }
-
-    @JsonProperty("azureFile")
-    public void setAzureFile(ClusterServiceVersionSpecISpecDSpecTSpecVAzureFile azureFile) {
-        this.azureFile = azureFile;
-    }
-
-    @JsonProperty("cephfs")
-    public ClusterServiceVersionSpecISpecDSpecTSpecVCephfs getCephfs() {
-        return cephfs;
-    }
-
-    @JsonProperty("cephfs")
-    public void setCephfs(ClusterServiceVersionSpecISpecDSpecTSpecVCephfs cephfs) {
-        this.cephfs = cephfs;
-    }
-
-    @JsonProperty("cinder")
-    public ClusterServiceVersionSpecISpecDSpecTSpecVCinder getCinder() {
-        return cinder;
-    }
-
-    @JsonProperty("cinder")
-    public void setCinder(ClusterServiceVersionSpecISpecDSpecTSpecVCinder cinder) {
-        this.cinder = cinder;
-    }
-
-    @JsonProperty("configMap")
-    public ClusterServiceVersionSpecISpecDSpecTSpecVConfigMap getConfigMap() {
-        return configMap;
-    }
-
-    @JsonProperty("configMap")
-    public void setConfigMap(ClusterServiceVersionSpecISpecDSpecTSpecVConfigMap configMap) {
-        this.configMap = configMap;
-    }
-
-    @JsonProperty("csi")
-    public ClusterServiceVersionSpecISpecDSpecTSpecVCsi getCsi() {
-        return csi;
-    }
-
-    @JsonProperty("csi")
-    public void setCsi(ClusterServiceVersionSpecISpecDSpecTSpecVCsi csi) {
-        this.csi = csi;
-    }
-
-    @JsonProperty("downwardAPI")
-    public ClusterServiceVersionSpecISpecDSpecTSpecVDownwardAPI getDownwardAPI() {
-        return downwardAPI;
-    }
-
-    @JsonProperty("downwardAPI")
-    public void setDownwardAPI(ClusterServiceVersionSpecISpecDSpecTSpecVDownwardAPI downwardAPI) {
-        this.downwardAPI = downwardAPI;
-    }
-
-    @JsonProperty("emptyDir")
-    public ClusterServiceVersionSpecISpecDSpecTSpecVEmptyDir getEmptyDir() {
-        return emptyDir;
-    }
-
-    @JsonProperty("emptyDir")
-    public void setEmptyDir(ClusterServiceVersionSpecISpecDSpecTSpecVEmptyDir emptyDir) {
-        this.emptyDir = emptyDir;
-    }
-
-    @JsonProperty("ephemeral")
-    public ClusterServiceVersionSpecISpecDSpecTSpecVEphemeral getEphemeral() {
-        return ephemeral;
-    }
-
-    @JsonProperty("ephemeral")
-    public void setEphemeral(ClusterServiceVersionSpecISpecDSpecTSpecVEphemeral ephemeral) {
-        this.ephemeral = ephemeral;
-    }
-
-    @JsonProperty("fc")
-    public ClusterServiceVersionSpecISpecDSpecTSpecVFc getFc() {
-        return fc;
-    }
-
-    @JsonProperty("fc")
-    public void setFc(ClusterServiceVersionSpecISpecDSpecTSpecVFc fc) {
-        this.fc = fc;
-    }
-
-    @JsonProperty("flexVolume")
-    public ClusterServiceVersionSpecISpecDSpecTSpecVFlexVolume getFlexVolume() {
-        return flexVolume;
-    }
-
-    @JsonProperty("flexVolume")
-    public void setFlexVolume(ClusterServiceVersionSpecISpecDSpecTSpecVFlexVolume flexVolume) {
-        this.flexVolume = flexVolume;
-    }
-
-    @JsonProperty("flocker")
-    public ClusterServiceVersionSpecISpecDSpecTSpecVFlocker getFlocker() {
-        return flocker;
-    }
-
-    @JsonProperty("flocker")
-    public void setFlocker(ClusterServiceVersionSpecISpecDSpecTSpecVFlocker flocker) {
-        this.flocker = flocker;
-    }
-
-    @JsonProperty("gcePersistentDisk")
-    public ClusterServiceVersionSpecISpecDSpecTSpecVGcePersistentDisk getGcePersistentDisk() {
-        return gcePersistentDisk;
-    }
-
-    @JsonProperty("gcePersistentDisk")
-    public void setGcePersistentDisk(ClusterServiceVersionSpecISpecDSpecTSpecVGcePersistentDisk gcePersistentDisk) {
-        this.gcePersistentDisk = gcePersistentDisk;
-    }
-
-    @JsonProperty("gitRepo")
-    public ClusterServiceVersionSpecISpecDSpecTSpecVGitRepo getGitRepo() {
-        return gitRepo;
-    }
-
-    @JsonProperty("gitRepo")
-    public void setGitRepo(ClusterServiceVersionSpecISpecDSpecTSpecVGitRepo gitRepo) {
-        this.gitRepo = gitRepo;
-    }
-
-    @JsonProperty("glusterfs")
-    public ClusterServiceVersionSpecISpecDSpecTSpecVGlusterfs getGlusterfs() {
-        return glusterfs;
-    }
-
-    @JsonProperty("glusterfs")
-    public void setGlusterfs(ClusterServiceVersionSpecISpecDSpecTSpecVGlusterfs glusterfs) {
-        this.glusterfs = glusterfs;
-    }
-
-    @JsonProperty("hostPath")
-    public ClusterServiceVersionSpecISpecDSpecTSpecVHostPath getHostPath() {
-        return hostPath;
-    }
-
-    @JsonProperty("hostPath")
-    public void setHostPath(ClusterServiceVersionSpecISpecDSpecTSpecVHostPath hostPath) {
-        this.hostPath = hostPath;
-    }
-
-    @JsonProperty("iscsi")
-    public ClusterServiceVersionSpecISpecDSpecTSpecVIscsi getIscsi() {
-        return iscsi;
-    }
-
-    @JsonProperty("iscsi")
-    public void setIscsi(ClusterServiceVersionSpecISpecDSpecTSpecVIscsi iscsi) {
-        this.iscsi = iscsi;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("nfs")
-    public ClusterServiceVersionSpecISpecDSpecTSpecVNfs getNfs() {
-        return nfs;
-    }
-
-    @JsonProperty("nfs")
-    public void setNfs(ClusterServiceVersionSpecISpecDSpecTSpecVNfs nfs) {
-        this.nfs = nfs;
-    }
-
-    @JsonProperty("persistentVolumeClaim")
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPersistentVolumeClaim getPersistentVolumeClaim() {
-        return persistentVolumeClaim;
-    }
-
-    @JsonProperty("persistentVolumeClaim")
-    public void setPersistentVolumeClaim(ClusterServiceVersionSpecISpecDSpecTSpecVPersistentVolumeClaim persistentVolumeClaim) {
-        this.persistentVolumeClaim = persistentVolumeClaim;
-    }
-
-    @JsonProperty("photonPersistentDisk")
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPhotonPersistentDisk getPhotonPersistentDisk() {
-        return photonPersistentDisk;
-    }
-
-    @JsonProperty("photonPersistentDisk")
-    public void setPhotonPersistentDisk(ClusterServiceVersionSpecISpecDSpecTSpecVPhotonPersistentDisk photonPersistentDisk) {
-        this.photonPersistentDisk = photonPersistentDisk;
-    }
-
-    @JsonProperty("portworxVolume")
-    public ClusterServiceVersionSpecISpecDSpecTSpecVPortworxVolume getPortworxVolume() {
-        return portworxVolume;
-    }
-
-    @JsonProperty("portworxVolume")
-    public void setPortworxVolume(ClusterServiceVersionSpecISpecDSpecTSpecVPortworxVolume portworxVolume) {
-        this.portworxVolume = portworxVolume;
-    }
-
-    @JsonProperty("projected")
-    public ClusterServiceVersionSpecISpecDSpecTSpecVProjected getProjected() {
-        return projected;
-    }
-
-    @JsonProperty("projected")
-    public void setProjected(ClusterServiceVersionSpecISpecDSpecTSpecVProjected projected) {
-        this.projected = projected;
-    }
-
-    @JsonProperty("quobyte")
-    public ClusterServiceVersionSpecISpecDSpecTSpecVQuobyte getQuobyte() {
-        return quobyte;
-    }
-
-    @JsonProperty("quobyte")
-    public void setQuobyte(ClusterServiceVersionSpecISpecDSpecTSpecVQuobyte quobyte) {
-        this.quobyte = quobyte;
-    }
-
-    @JsonProperty("rbd")
-    public ClusterServiceVersionSpecISpecDSpecTSpecVRbd getRbd() {
-        return rbd;
-    }
-
-    @JsonProperty("rbd")
-    public void setRbd(ClusterServiceVersionSpecISpecDSpecTSpecVRbd rbd) {
-        this.rbd = rbd;
-    }
-
-    @JsonProperty("scaleIO")
-    public ClusterServiceVersionSpecISpecDSpecTSpecVScaleIO getScaleIO() {
-        return scaleIO;
-    }
-
-    @JsonProperty("scaleIO")
-    public void setScaleIO(ClusterServiceVersionSpecISpecDSpecTSpecVScaleIO scaleIO) {
-        this.scaleIO = scaleIO;
-    }
-
-    @JsonProperty("secret")
-    public ClusterServiceVersionSpecISpecDSpecTSpecVSecret getSecret() {
-        return secret;
-    }
-
-    @JsonProperty("secret")
-    public void setSecret(ClusterServiceVersionSpecISpecDSpecTSpecVSecret secret) {
-        this.secret = secret;
-    }
-
-    @JsonProperty("storageos")
-    public ClusterServiceVersionSpecISpecDSpecTSpecVStorageos getStorageos() {
-        return storageos;
-    }
-
-    @JsonProperty("storageos")
-    public void setStorageos(ClusterServiceVersionSpecISpecDSpecTSpecVStorageos storageos) {
-        this.storageos = storageos;
-    }
-
-    @JsonProperty("vsphereVolume")
-    public ClusterServiceVersionSpecISpecDSpecTSpecVVsphereVolume getVsphereVolume() {
-        return vsphereVolume;
-    }
-
-    @JsonProperty("vsphereVolume")
-    public void setVsphereVolume(ClusterServiceVersionSpecISpecDSpecTSpecVVsphereVolume vsphereVolume) {
-        this.vsphereVolume = vsphereVolume;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVolumesBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTSpecVolumesBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTSpecVolumesBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTemplate.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTemplate.java
deleted file mode 100644
index 48fac7e3952..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDSpecTemplate.java
+++ /dev/null
@@ -1,124 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "metadata",
-    "spec"
-})
-@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 ClusterServiceVersionSpecISpecDSpecTemplate implements Editable<ClusterServiceVersionSpecISpecDSpecTemplateBuilder> , KubernetesResource
-{
-
-    @JsonProperty("metadata")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object metadata;
-    @JsonProperty("spec")
-    private ClusterServiceVersionSpecISpecDSpecTSpec spec;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecDSpecTemplate() {
-    }
-
-    public ClusterServiceVersionSpecISpecDSpecTemplate(Object metadata, ClusterServiceVersionSpecISpecDSpecTSpec spec) {
-        super();
-        this.metadata = metadata;
-        this.spec = spec;
-    }
-
-    @JsonProperty("metadata")
-    public Object getMetadata() {
-        return metadata;
-    }
-
-    @JsonProperty("metadata")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setMetadata(Object metadata) {
-        this.metadata = metadata;
-    }
-
-    @JsonProperty("spec")
-    public ClusterServiceVersionSpecISpecDSpecTSpec getSpec() {
-        return spec;
-    }
-
-    @JsonProperty("spec")
-    public void setSpec(ClusterServiceVersionSpecISpecDSpecTSpec spec) {
-        this.spec = spec;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTemplateBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDSpecTemplateBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecDSpecTemplateBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecPRules.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecPRules.java
deleted file mode 100644
index 071d42b58d0..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecPRules.java
+++ /dev/null
@@ -1,176 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "apiGroups",
-    "nonResourceURLs",
-    "resourceNames",
-    "resources",
-    "verbs"
-})
-@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 ClusterServiceVersionSpecISpecPRules implements Editable<ClusterServiceVersionSpecISpecPRulesBuilder> , KubernetesResource
-{
-
-    @JsonProperty("apiGroups")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> apiGroups = new ArrayList<>();
-    @JsonProperty("nonResourceURLs")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> nonResourceURLs = new ArrayList<>();
-    @JsonProperty("resourceNames")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> resourceNames = new ArrayList<>();
-    @JsonProperty("resources")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> resources = new ArrayList<>();
-    @JsonProperty("verbs")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> verbs = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecISpecPRules() {
-    }
-
-    public ClusterServiceVersionSpecISpecPRules(List<String> apiGroups, List<String> nonResourceURLs, List<String> resourceNames, List<String> resources, List<String> verbs) {
-        super();
-        this.apiGroups = apiGroups;
-        this.nonResourceURLs = nonResourceURLs;
-        this.resourceNames = resourceNames;
-        this.resources = resources;
-        this.verbs = verbs;
-    }
-
-    @JsonProperty("apiGroups")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getApiGroups() {
-        return apiGroups;
-    }
-
-    @JsonProperty("apiGroups")
-    public void setApiGroups(List<String> apiGroups) {
-        this.apiGroups = apiGroups;
-    }
-
-    @JsonProperty("nonResourceURLs")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getNonResourceURLs() {
-        return nonResourceURLs;
-    }
-
-    @JsonProperty("nonResourceURLs")
-    public void setNonResourceURLs(List<String> nonResourceURLs) {
-        this.nonResourceURLs = nonResourceURLs;
-    }
-
-    @JsonProperty("resourceNames")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getResourceNames() {
-        return resourceNames;
-    }
-
-    @JsonProperty("resourceNames")
-    public void setResourceNames(List<String> resourceNames) {
-        this.resourceNames = resourceNames;
-    }
-
-    @JsonProperty("resources")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getResources() {
-        return resources;
-    }
-
-    @JsonProperty("resources")
-    public void setResources(List<String> resources) {
-        this.resources = resources;
-    }
-
-    @JsonProperty("verbs")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getVerbs() {
-        return verbs;
-    }
-
-    @JsonProperty("verbs")
-    public void setVerbs(List<String> verbs) {
-        this.verbs = verbs;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecPRulesBuilder edit() {
-        return new ClusterServiceVersionSpecISpecPRulesBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecISpecPRulesBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecIcon.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecIcon.java
deleted file mode 100644
index 1dda18b7d8c..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecIcon.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "base64data",
-    "mediatype"
-})
-@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 ClusterServiceVersionSpecIcon implements Editable<ClusterServiceVersionSpecIconBuilder> , KubernetesResource
-{
-
-    @JsonProperty("base64data")
-    private String base64data;
-    @JsonProperty("mediatype")
-    private String mediatype;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecIcon() {
-    }
-
-    public ClusterServiceVersionSpecIcon(String base64data, String mediatype) {
-        super();
-        this.base64data = base64data;
-        this.mediatype = mediatype;
-    }
-
-    @JsonProperty("base64data")
-    public String getBase64data() {
-        return base64data;
-    }
-
-    @JsonProperty("base64data")
-    public void setBase64data(String base64data) {
-        this.base64data = base64data;
-    }
-
-    @JsonProperty("mediatype")
-    public String getMediatype() {
-        return mediatype;
-    }
-
-    @JsonProperty("mediatype")
-    public void setMediatype(String mediatype) {
-        this.mediatype = mediatype;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecIconBuilder edit() {
-        return new ClusterServiceVersionSpecIconBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecIconBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecInstallModes.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecInstallModes.java
deleted file mode 100644
index b292cd1c41d..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecInstallModes.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "supported",
-    "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 ClusterServiceVersionSpecInstallModes implements Editable<ClusterServiceVersionSpecInstallModesBuilder> , KubernetesResource
-{
-
-    @JsonProperty("supported")
-    private Boolean supported;
-    @JsonProperty("type")
-    private String type;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecInstallModes() {
-    }
-
-    public ClusterServiceVersionSpecInstallModes(Boolean supported, String type) {
-        super();
-        this.supported = supported;
-        this.type = type;
-    }
-
-    @JsonProperty("supported")
-    public Boolean getSupported() {
-        return supported;
-    }
-
-    @JsonProperty("supported")
-    public void setSupported(Boolean supported) {
-        this.supported = supported;
-    }
-
-    @JsonProperty("type")
-    public String getType() {
-        return type;
-    }
-
-    @JsonProperty("type")
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecInstallModesBuilder edit() {
-        return new ClusterServiceVersionSpecInstallModesBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecInstallModesBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecLinks.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecLinks.java
deleted file mode 100644
index 26e3119ae72..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecLinks.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name",
-    "url"
-})
-@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 ClusterServiceVersionSpecLinks implements Editable<ClusterServiceVersionSpecLinksBuilder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("url")
-    private String url;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecLinks() {
-    }
-
-    public ClusterServiceVersionSpecLinks(String name, String url) {
-        super();
-        this.name = name;
-        this.url = url;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("url")
-    public String getUrl() {
-        return url;
-    }
-
-    @JsonProperty("url")
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecLinksBuilder edit() {
-        return new ClusterServiceVersionSpecLinksBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecLinksBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecMaintainers.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecMaintainers.java
deleted file mode 100644
index 7a8b6daaeac..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecMaintainers.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "email",
-    "name"
-})
-@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 ClusterServiceVersionSpecMaintainers implements Editable<ClusterServiceVersionSpecMaintainersBuilder> , KubernetesResource
-{
-
-    @JsonProperty("email")
-    private String email;
-    @JsonProperty("name")
-    private String name;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecMaintainers() {
-    }
-
-    public ClusterServiceVersionSpecMaintainers(String email, String name) {
-        super();
-        this.email = email;
-        this.name = name;
-    }
-
-    @JsonProperty("email")
-    public String getEmail() {
-        return email;
-    }
-
-    @JsonProperty("email")
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecMaintainersBuilder edit() {
-        return new ClusterServiceVersionSpecMaintainersBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecMaintainersBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecNativeAPIs.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecNativeAPIs.java
deleted file mode 100644
index 093baea585c..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecNativeAPIs.java
+++ /dev/null
@@ -1,136 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "kind",
-    "group",
-    "version"
-})
-@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 ClusterServiceVersionSpecNativeAPIs implements Editable<ClusterServiceVersionSpecNativeAPIsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("group")
-    private String group;
-    @JsonProperty("kind")
-    private String kind;
-    @JsonProperty("version")
-    private String version;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecNativeAPIs() {
-    }
-
-    public ClusterServiceVersionSpecNativeAPIs(String group, String kind, String version) {
-        super();
-        this.group = group;
-        this.kind = kind;
-        this.version = version;
-    }
-
-    @JsonProperty("group")
-    public String getGroup() {
-        return group;
-    }
-
-    @JsonProperty("group")
-    public void setGroup(String group) {
-        this.group = group;
-    }
-
-    @JsonProperty("kind")
-    public String getKind() {
-        return kind;
-    }
-
-    @JsonProperty("kind")
-    public void setKind(String kind) {
-        this.kind = kind;
-    }
-
-    @JsonProperty("version")
-    public String getVersion() {
-        return version;
-    }
-
-    @JsonProperty("version")
-    public void setVersion(String version) {
-        this.version = version;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecNativeAPIsBuilder edit() {
-        return new ClusterServiceVersionSpecNativeAPIsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecNativeAPIsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecProvider.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecProvider.java
deleted file mode 100644
index 87dde4b1fda..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecProvider.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name",
-    "url"
-})
-@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 ClusterServiceVersionSpecProvider implements Editable<ClusterServiceVersionSpecProviderBuilder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("url")
-    private String url;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecProvider() {
-    }
-
-    public ClusterServiceVersionSpecProvider(String name, String url) {
-        super();
-        this.name = name;
-        this.url = url;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("url")
-    public String getUrl() {
-        return url;
-    }
-
-    @JsonProperty("url")
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecProviderBuilder edit() {
-        return new ClusterServiceVersionSpecProviderBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecProviderBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecSMatchExpressions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecSMatchExpressions.java
deleted file mode 100644
index 92e46a5f1fe..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecSMatchExpressions.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "operator",
-    "values"
-})
-@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 ClusterServiceVersionSpecSMatchExpressions implements Editable<ClusterServiceVersionSpecSMatchExpressionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("operator")
-    private String operator;
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> values = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecSMatchExpressions() {
-    }
-
-    public ClusterServiceVersionSpecSMatchExpressions(String key, String operator, List<String> values) {
-        super();
-        this.key = key;
-        this.operator = operator;
-        this.values = values;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("operator")
-    public String getOperator() {
-        return operator;
-    }
-
-    @JsonProperty("operator")
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getValues() {
-        return values;
-    }
-
-    @JsonProperty("values")
-    public void setValues(List<String> values) {
-        this.values = values;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecSMatchExpressionsBuilder edit() {
-        return new ClusterServiceVersionSpecSMatchExpressionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecSMatchExpressionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecSelector.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecSelector.java
deleted file mode 100644
index f45de322327..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecSelector.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "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 ClusterServiceVersionSpecSelector implements Editable<ClusterServiceVersionSpecSelectorBuilder> , KubernetesResource
-{
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecSMatchExpressions> matchExpressions = new ArrayList<>();
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, String> matchLabels = new LinkedHashMap<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecSelector() {
-    }
-
-    public ClusterServiceVersionSpecSelector(List<ClusterServiceVersionSpecSMatchExpressions> matchExpressions, Map<String, String> matchLabels) {
-        super();
-        this.matchExpressions = matchExpressions;
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecSMatchExpressions> getMatchExpressions() {
-        return matchExpressions;
-    }
-
-    @JsonProperty("matchExpressions")
-    public void setMatchExpressions(List<ClusterServiceVersionSpecSMatchExpressions> matchExpressions) {
-        this.matchExpressions = matchExpressions;
-    }
-
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, String> getMatchLabels() {
-        return matchLabels;
-    }
-
-    @JsonProperty("matchLabels")
-    public void setMatchLabels(Map<String, String> matchLabels) {
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecSelectorBuilder edit() {
-        return new ClusterServiceVersionSpecSelectorBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecSelectorBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecWOSMatchExpressions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecWOSMatchExpressions.java
deleted file mode 100644
index 5960ab4fd2c..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecWOSMatchExpressions.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "operator",
-    "values"
-})
-@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 ClusterServiceVersionSpecWOSMatchExpressions implements Editable<ClusterServiceVersionSpecWOSMatchExpressionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("operator")
-    private String operator;
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> values = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecWOSMatchExpressions() {
-    }
-
-    public ClusterServiceVersionSpecWOSMatchExpressions(String key, String operator, List<String> values) {
-        super();
-        this.key = key;
-        this.operator = operator;
-        this.values = values;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("operator")
-    public String getOperator() {
-        return operator;
-    }
-
-    @JsonProperty("operator")
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getValues() {
-        return values;
-    }
-
-    @JsonProperty("values")
-    public void setValues(List<String> values) {
-        this.values = values;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecWOSMatchExpressionsBuilder edit() {
-        return new ClusterServiceVersionSpecWOSMatchExpressionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecWOSMatchExpressionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecWObjectSelector.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecWObjectSelector.java
deleted file mode 100644
index c39c7610a4c..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecWObjectSelector.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "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 ClusterServiceVersionSpecWObjectSelector implements Editable<ClusterServiceVersionSpecWObjectSelectorBuilder> , KubernetesResource
-{
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecWOSMatchExpressions> matchExpressions = new ArrayList<>();
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, String> matchLabels = new LinkedHashMap<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecWObjectSelector() {
-    }
-
-    public ClusterServiceVersionSpecWObjectSelector(List<ClusterServiceVersionSpecWOSMatchExpressions> matchExpressions, Map<String, String> matchLabels) {
-        super();
-        this.matchExpressions = matchExpressions;
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecWOSMatchExpressions> getMatchExpressions() {
-        return matchExpressions;
-    }
-
-    @JsonProperty("matchExpressions")
-    public void setMatchExpressions(List<ClusterServiceVersionSpecWOSMatchExpressions> matchExpressions) {
-        this.matchExpressions = matchExpressions;
-    }
-
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, String> getMatchLabels() {
-        return matchLabels;
-    }
-
-    @JsonProperty("matchLabels")
-    public void setMatchLabels(Map<String, String> matchLabels) {
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecWObjectSelectorBuilder edit() {
-        return new ClusterServiceVersionSpecWObjectSelectorBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecWObjectSelectorBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecWRules.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecWRules.java
deleted file mode 100644
index db521fe2530..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecWRules.java
+++ /dev/null
@@ -1,174 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "apiGroups",
-    "apiVersions",
-    "operations",
-    "resources",
-    "scope"
-})
-@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 ClusterServiceVersionSpecWRules implements Editable<ClusterServiceVersionSpecWRulesBuilder> , KubernetesResource
-{
-
-    @JsonProperty("apiGroups")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> apiGroups = new ArrayList<>();
-    @JsonProperty("apiVersions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> apiVersions = new ArrayList<>();
-    @JsonProperty("operations")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> operations = new ArrayList<>();
-    @JsonProperty("resources")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> resources = new ArrayList<>();
-    @JsonProperty("scope")
-    private String scope;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ClusterServiceVersionSpecWRules() {
-    }
-
-    public ClusterServiceVersionSpecWRules(List<String> apiGroups, List<String> apiVersions, List<String> operations, List<String> resources, String scope) {
-        super();
-        this.apiGroups = apiGroups;
-        this.apiVersions = apiVersions;
-        this.operations = operations;
-        this.resources = resources;
-        this.scope = scope;
-    }
-
-    @JsonProperty("apiGroups")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getApiGroups() {
-        return apiGroups;
-    }
-
-    @JsonProperty("apiGroups")
-    public void setApiGroups(List<String> apiGroups) {
-        this.apiGroups = apiGroups;
-    }
-
-    @JsonProperty("apiVersions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getApiVersions() {
-        return apiVersions;
-    }
-
-    @JsonProperty("apiVersions")
-    public void setApiVersions(List<String> apiVersions) {
-        this.apiVersions = apiVersions;
-    }
-
-    @JsonProperty("operations")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getOperations() {
-        return operations;
-    }
-
-    @JsonProperty("operations")
-    public void setOperations(List<String> operations) {
-        this.operations = operations;
-    }
-
-    @JsonProperty("resources")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getResources() {
-        return resources;
-    }
-
-    @JsonProperty("resources")
-    public void setResources(List<String> resources) {
-        this.resources = resources;
-    }
-
-    @JsonProperty("scope")
-    public String getScope() {
-        return scope;
-    }
-
-    @JsonProperty("scope")
-    public void setScope(String scope) {
-        this.scope = scope;
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecWRulesBuilder edit() {
-        return new ClusterServiceVersionSpecWRulesBuilder(this);
-    }
-
-    @JsonIgnore
-    public ClusterServiceVersionSpecWRulesBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionStatus.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionStatus.java
index 82f97d5aef9..9592ab2ce95 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionStatus.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionStatus.java
@@ -70,10 +70,10 @@ public class ClusterServiceVersionStatus implements Editable<ClusterServiceVersi
     @JsonProperty("certsRotateAt")
     private String certsRotateAt;
     @JsonProperty("cleanup")
-    private ClusterServiceVersionStatusCleanup cleanup;
+    private CleanupStatus cleanup;
     @JsonProperty("conditions")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionStatusConditions> conditions = new ArrayList<>();
+    private List<ClusterServiceVersionCondition> conditions = new ArrayList<>();
     @JsonProperty("lastTransitionTime")
     private String lastTransitionTime;
     @JsonProperty("lastUpdateTime")
@@ -86,7 +86,7 @@ public class ClusterServiceVersionStatus implements Editable<ClusterServiceVersi
     private String reason;
     @JsonProperty("requirementStatus")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionStatusRequirementStatus> requirementStatus = new ArrayList<>();
+    private List<RequirementStatus> requirementStatus = new ArrayList<>();
     @JsonIgnore
     private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
 
@@ -97,7 +97,7 @@ public class ClusterServiceVersionStatus implements Editable<ClusterServiceVersi
     public ClusterServiceVersionStatus() {
     }
 
-    public ClusterServiceVersionStatus(String certsLastUpdated, String certsRotateAt, ClusterServiceVersionStatusCleanup cleanup, List<ClusterServiceVersionStatusConditions> conditions, String lastTransitionTime, String lastUpdateTime, String message, String phase, String reason, List<ClusterServiceVersionStatusRequirementStatus> requirementStatus) {
+    public ClusterServiceVersionStatus(String certsLastUpdated, String certsRotateAt, CleanupStatus cleanup, List<ClusterServiceVersionCondition> conditions, String lastTransitionTime, String lastUpdateTime, String message, String phase, String reason, List<RequirementStatus> requirementStatus) {
         super();
         this.certsLastUpdated = certsLastUpdated;
         this.certsRotateAt = certsRotateAt;
@@ -132,23 +132,23 @@ public void setCertsRotateAt(String certsRotateAt) {
     }
 
     @JsonProperty("cleanup")
-    public ClusterServiceVersionStatusCleanup getCleanup() {
+    public CleanupStatus getCleanup() {
         return cleanup;
     }
 
     @JsonProperty("cleanup")
-    public void setCleanup(ClusterServiceVersionStatusCleanup cleanup) {
+    public void setCleanup(CleanupStatus cleanup) {
         this.cleanup = cleanup;
     }
 
     @JsonProperty("conditions")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionStatusConditions> getConditions() {
+    public List<ClusterServiceVersionCondition> getConditions() {
         return conditions;
     }
 
     @JsonProperty("conditions")
-    public void setConditions(List<ClusterServiceVersionStatusConditions> conditions) {
+    public void setConditions(List<ClusterServiceVersionCondition> conditions) {
         this.conditions = conditions;
     }
 
@@ -204,12 +204,12 @@ public void setReason(String reason) {
 
     @JsonProperty("requirementStatus")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionStatusRequirementStatus> getRequirementStatus() {
+    public List<RequirementStatus> getRequirementStatus() {
         return requirementStatus;
     }
 
     @JsonProperty("requirementStatus")
-    public void setRequirementStatus(List<ClusterServiceVersionStatusRequirementStatus> requirementStatus) {
+    public void setRequirementStatus(List<RequirementStatus> requirementStatus) {
         this.requirementStatus = requirementStatus;
     }
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceStatusConfigMapReference.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ConfigMapResourceReference.java
similarity index 89%
rename from kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceStatusConfigMapReference.java
rename to kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ConfigMapResourceReference.java
index 352e34decc9..a9133d7f6e3 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceStatusConfigMapReference.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ConfigMapResourceReference.java
@@ -55,7 +55,7 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class CatalogSourceStatusConfigMapReference implements Editable<CatalogSourceStatusConfigMapReferenceBuilder> , KubernetesResource
+public class ConfigMapResourceReference implements Editable<ConfigMapResourceReferenceBuilder> , KubernetesResource
 {
 
     @JsonProperty("lastUpdateTime")
@@ -75,10 +75,10 @@ public class CatalogSourceStatusConfigMapReference implements Editable<CatalogSo
      * No args constructor for use in serialization
      * 
      */
-    public CatalogSourceStatusConfigMapReference() {
+    public ConfigMapResourceReference() {
     }
 
-    public CatalogSourceStatusConfigMapReference(String lastUpdateTime, String name, String namespace, String resourceVersion, String uid) {
+    public ConfigMapResourceReference(String lastUpdateTime, String name, String namespace, String resourceVersion, String uid) {
         super();
         this.lastUpdateTime = lastUpdateTime;
         this.name = name;
@@ -138,12 +138,12 @@ public void setUid(String uid) {
     }
 
     @JsonIgnore
-    public CatalogSourceStatusConfigMapReferenceBuilder edit() {
-        return new CatalogSourceStatusConfigMapReferenceBuilder(this);
+    public ConfigMapResourceReferenceBuilder edit() {
+        return new ConfigMapResourceReferenceBuilder(this);
     }
 
     @JsonIgnore
-    public CatalogSourceStatusConfigMapReferenceBuilder toBuilder() {
+    public ConfigMapResourceReferenceBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionStatusRSDependents.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/DependentStatus.java
similarity index 89%
rename from kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionStatusRSDependents.java
rename to kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/DependentStatus.java
index 3206dda1164..18049975635 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionStatusRSDependents.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/DependentStatus.java
@@ -56,7 +56,7 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class ClusterServiceVersionStatusRSDependents implements Editable<ClusterServiceVersionStatusRSDependentsBuilder> , KubernetesResource
+public class DependentStatus implements Editable<DependentStatusBuilder> , KubernetesResource
 {
 
     @JsonProperty("group")
@@ -78,10 +78,10 @@ public class ClusterServiceVersionStatusRSDependents implements Editable<Cluster
      * No args constructor for use in serialization
      * 
      */
-    public ClusterServiceVersionStatusRSDependents() {
+    public DependentStatus() {
     }
 
-    public ClusterServiceVersionStatusRSDependents(String group, String kind, String message, String status, String uuid, String version) {
+    public DependentStatus(String group, String kind, String message, String status, String uuid, String version) {
         super();
         this.group = group;
         this.kind = kind;
@@ -152,12 +152,12 @@ public void setVersion(String version) {
     }
 
     @JsonIgnore
-    public ClusterServiceVersionStatusRSDependentsBuilder edit() {
-        return new ClusterServiceVersionStatusRSDependentsBuilder(this);
+    public DependentStatusBuilder edit() {
+        return new DependentStatusBuilder(this);
     }
 
     @JsonIgnore
-    public ClusterServiceVersionStatusRSDependentsBuilder toBuilder() {
+    public DependentStatusBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCExtractContent.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ExtractContentConfig.java
similarity index 88%
rename from kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCExtractContent.java
rename to kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ExtractContentConfig.java
index 6256170d72e..e41857bdfa4 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGPCExtractContent.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ExtractContentConfig.java
@@ -52,7 +52,7 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class CatalogSourceSpecGPCExtractContent implements Editable<CatalogSourceSpecGPCExtractContentBuilder> , KubernetesResource
+public class ExtractContentConfig implements Editable<ExtractContentConfigBuilder> , KubernetesResource
 {
 
     @JsonProperty("cacheDir")
@@ -66,10 +66,10 @@ public class CatalogSourceSpecGPCExtractContent implements Editable<CatalogSourc
      * No args constructor for use in serialization
      * 
      */
-    public CatalogSourceSpecGPCExtractContent() {
+    public ExtractContentConfig() {
     }
 
-    public CatalogSourceSpecGPCExtractContent(String cacheDir, String catalogDir) {
+    public ExtractContentConfig(String cacheDir, String catalogDir) {
         super();
         this.cacheDir = cacheDir;
         this.catalogDir = catalogDir;
@@ -96,12 +96,12 @@ public void setCatalogDir(String catalogDir) {
     }
 
     @JsonIgnore
-    public CatalogSourceSpecGPCExtractContentBuilder edit() {
-        return new CatalogSourceSpecGPCExtractContentBuilder(this);
+    public ExtractContentConfigBuilder edit() {
+        return new ExtractContentConfigBuilder(this);
     }
 
     @JsonIgnore
-    public CatalogSourceSpecGPCExtractContentBuilder toBuilder() {
+    public ExtractContentConfigBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceStatusConnectionState.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/GRPCConnectionState.java
similarity index 89%
rename from kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceStatusConnectionState.java
rename to kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/GRPCConnectionState.java
index 54dd8f9b026..e285aa4a2e2 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceStatusConnectionState.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/GRPCConnectionState.java
@@ -53,7 +53,7 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class CatalogSourceStatusConnectionState implements Editable<CatalogSourceStatusConnectionStateBuilder> , KubernetesResource
+public class GRPCConnectionState implements Editable<GRPCConnectionStateBuilder> , KubernetesResource
 {
 
     @JsonProperty("address")
@@ -69,10 +69,10 @@ public class CatalogSourceStatusConnectionState implements Editable<CatalogSourc
      * No args constructor for use in serialization
      * 
      */
-    public CatalogSourceStatusConnectionState() {
+    public GRPCConnectionState() {
     }
 
-    public CatalogSourceStatusConnectionState(String address, String lastConnect, String lastObservedState) {
+    public GRPCConnectionState(String address, String lastConnect, String lastObservedState) {
         super();
         this.address = address;
         this.lastConnect = lastConnect;
@@ -110,12 +110,12 @@ public void setLastObservedState(String lastObservedState) {
     }
 
     @JsonIgnore
-    public CatalogSourceStatusConnectionStateBuilder edit() {
-        return new CatalogSourceStatusConnectionStateBuilder(this);
+    public GRPCConnectionStateBuilder edit() {
+        return new GRPCConnectionStateBuilder(this);
     }
 
     @JsonIgnore
-    public CatalogSourceStatusConnectionStateBuilder toBuilder() {
+    public GRPCConnectionStateBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGrpcPodConfig.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/GrpcPodConfig.java
similarity index 77%
rename from kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGrpcPodConfig.java
rename to kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/GrpcPodConfig.java
index 790c7b0d843..cdf1cdd5b21 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecGrpcPodConfig.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/GrpcPodConfig.java
@@ -14,6 +14,7 @@
 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.Affinity;
 import io.fabric8.kubernetes.api.model.Container;
 import io.fabric8.kubernetes.api.model.IntOrString;
 import io.fabric8.kubernetes.api.model.KubernetesResource;
@@ -23,7 +24,9 @@
 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.Quantity;
 import io.fabric8.kubernetes.api.model.ResourceRequirements;
+import io.fabric8.kubernetes.api.model.Toleration;
 import io.sundr.builder.annotations.Buildable;
 import io.sundr.builder.annotations.BuildableReference;
 import lombok.EqualsAndHashCode;
@@ -59,16 +62,15 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class CatalogSourceSpecGrpcPodConfig implements Editable<CatalogSourceSpecGrpcPodConfigBuilder> , KubernetesResource
+public class GrpcPodConfig implements Editable<GrpcPodConfigBuilder> , KubernetesResource
 {
 
     @JsonProperty("affinity")
-    private CatalogSourceSpecGPCAffinity affinity;
+    private Affinity affinity;
     @JsonProperty("extractContent")
-    private CatalogSourceSpecGPCExtractContent extractContent;
+    private ExtractContentConfig extractContent;
     @JsonProperty("memoryTarget")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object memoryTarget;
+    private Quantity memoryTarget;
     @JsonProperty("nodeSelector")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private Map<String, String> nodeSelector = new LinkedHashMap<>();
@@ -78,7 +80,7 @@ public class CatalogSourceSpecGrpcPodConfig implements Editable<CatalogSourceSpe
     private String securityContextConfig;
     @JsonProperty("tolerations")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<CatalogSourceSpecGPCTolerations> tolerations = new ArrayList<>();
+    private List<Toleration> tolerations = new ArrayList<>();
     @JsonIgnore
     private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
 
@@ -86,10 +88,10 @@ public class CatalogSourceSpecGrpcPodConfig implements Editable<CatalogSourceSpe
      * No args constructor for use in serialization
      * 
      */
-    public CatalogSourceSpecGrpcPodConfig() {
+    public GrpcPodConfig() {
     }
 
-    public CatalogSourceSpecGrpcPodConfig(CatalogSourceSpecGPCAffinity affinity, CatalogSourceSpecGPCExtractContent extractContent, Object memoryTarget, Map<String, String> nodeSelector, String priorityClassName, String securityContextConfig, List<CatalogSourceSpecGPCTolerations> tolerations) {
+    public GrpcPodConfig(Affinity affinity, ExtractContentConfig extractContent, Quantity memoryTarget, Map<String, String> nodeSelector, String priorityClassName, String securityContextConfig, List<Toleration> tolerations) {
         super();
         this.affinity = affinity;
         this.extractContent = extractContent;
@@ -101,33 +103,32 @@ public CatalogSourceSpecGrpcPodConfig(CatalogSourceSpecGPCAffinity affinity, Cat
     }
 
     @JsonProperty("affinity")
-    public CatalogSourceSpecGPCAffinity getAffinity() {
+    public Affinity getAffinity() {
         return affinity;
     }
 
     @JsonProperty("affinity")
-    public void setAffinity(CatalogSourceSpecGPCAffinity affinity) {
+    public void setAffinity(Affinity affinity) {
         this.affinity = affinity;
     }
 
     @JsonProperty("extractContent")
-    public CatalogSourceSpecGPCExtractContent getExtractContent() {
+    public ExtractContentConfig getExtractContent() {
         return extractContent;
     }
 
     @JsonProperty("extractContent")
-    public void setExtractContent(CatalogSourceSpecGPCExtractContent extractContent) {
+    public void setExtractContent(ExtractContentConfig extractContent) {
         this.extractContent = extractContent;
     }
 
     @JsonProperty("memoryTarget")
-    public Object getMemoryTarget() {
+    public Quantity getMemoryTarget() {
         return memoryTarget;
     }
 
     @JsonProperty("memoryTarget")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setMemoryTarget(Object memoryTarget) {
+    public void setMemoryTarget(Quantity memoryTarget) {
         this.memoryTarget = memoryTarget;
     }
 
@@ -164,22 +165,22 @@ public void setSecurityContextConfig(String securityContextConfig) {
 
     @JsonProperty("tolerations")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<CatalogSourceSpecGPCTolerations> getTolerations() {
+    public List<Toleration> getTolerations() {
         return tolerations;
     }
 
     @JsonProperty("tolerations")
-    public void setTolerations(List<CatalogSourceSpecGPCTolerations> tolerations) {
+    public void setTolerations(List<Toleration> tolerations) {
         this.tolerations = tolerations;
     }
 
     @JsonIgnore
-    public CatalogSourceSpecGrpcPodConfigBuilder edit() {
-        return new CatalogSourceSpecGrpcPodConfigBuilder(this);
+    public GrpcPodConfigBuilder edit() {
+        return new GrpcPodConfigBuilder(this);
     }
 
     @JsonIgnore
-    public CatalogSourceSpecGrpcPodConfigBuilder toBuilder() {
+    public GrpcPodConfigBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/lifecyclemanager/v1/Icon.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/Icon.java
similarity index 98%
rename from kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/lifecyclemanager/v1/Icon.java
rename to kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/Icon.java
index 3d5c9ff7afd..b4004d258fe 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/lifecyclemanager/v1/Icon.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/Icon.java
@@ -1,5 +1,5 @@
 
-package io.fabric8.openshift.api.model.operatorhub.lifecyclemanager.v1;
+package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/InstallPlanStatusBLConditions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/InstallPlanCondition.java
similarity index 90%
rename from kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/InstallPlanStatusBLConditions.java
rename to kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/InstallPlanCondition.java
index 3a709fd7922..4372d80743e 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/InstallPlanStatusBLConditions.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/InstallPlanCondition.java
@@ -56,7 +56,7 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class InstallPlanStatusBLConditions implements Editable<InstallPlanStatusBLConditionsBuilder> , KubernetesResource
+public class InstallPlanCondition implements Editable<InstallPlanConditionBuilder> , KubernetesResource
 {
 
     @JsonProperty("lastTransitionTime")
@@ -78,10 +78,10 @@ public class InstallPlanStatusBLConditions implements Editable<InstallPlanStatus
      * No args constructor for use in serialization
      * 
      */
-    public InstallPlanStatusBLConditions() {
+    public InstallPlanCondition() {
     }
 
-    public InstallPlanStatusBLConditions(String lastTransitionTime, String lastUpdateTime, String message, String reason, String status, String type) {
+    public InstallPlanCondition(String lastTransitionTime, String lastUpdateTime, String message, String reason, String status, String type) {
         super();
         this.lastTransitionTime = lastTransitionTime;
         this.lastUpdateTime = lastUpdateTime;
@@ -152,12 +152,12 @@ public void setType(String type) {
     }
 
     @JsonIgnore
-    public InstallPlanStatusBLConditionsBuilder edit() {
-        return new InstallPlanStatusBLConditionsBuilder(this);
+    public InstallPlanConditionBuilder edit() {
+        return new InstallPlanConditionBuilder(this);
     }
 
     @JsonIgnore
-    public InstallPlanStatusBLConditionsBuilder toBuilder() {
+    public InstallPlanConditionBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionStatusInstallplan.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/InstallPlanReference.java
similarity index 90%
rename from kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionStatusInstallplan.java
rename to kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/InstallPlanReference.java
index 359a33b08ba..ca040b0d812 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionStatusInstallplan.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/InstallPlanReference.java
@@ -54,7 +54,7 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class SubscriptionStatusInstallplan implements Editable<SubscriptionStatusInstallplanBuilder> , KubernetesResource
+public class InstallPlanReference implements Editable<InstallPlanReferenceBuilder> , KubernetesResource
 {
 
     @JsonProperty("apiVersion")
@@ -72,10 +72,10 @@ public class SubscriptionStatusInstallplan implements Editable<SubscriptionStatu
      * No args constructor for use in serialization
      * 
      */
-    public SubscriptionStatusInstallplan() {
+    public InstallPlanReference() {
     }
 
-    public SubscriptionStatusInstallplan(String apiVersion, String kind, String name, String uuid) {
+    public InstallPlanReference(String apiVersion, String kind, String name, String uuid) {
         super();
         this.apiVersion = apiVersion;
         this.kind = kind;
@@ -124,12 +124,12 @@ public void setUuid(String uuid) {
     }
 
     @JsonIgnore
-    public SubscriptionStatusInstallplanBuilder edit() {
-        return new SubscriptionStatusInstallplanBuilder(this);
+    public InstallPlanReferenceBuilder edit() {
+        return new InstallPlanReferenceBuilder(this);
     }
 
     @JsonIgnore
-    public SubscriptionStatusInstallplanBuilder toBuilder() {
+    public InstallPlanReferenceBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/InstallPlanStatus.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/InstallPlanStatus.java
index 995de5d1d81..aa0c74edf4e 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/InstallPlanStatus.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/InstallPlanStatus.java
@@ -64,23 +64,23 @@ public class InstallPlanStatus implements Editable<InstallPlanStatusBuilder> , K
 {
 
     @JsonProperty("attenuatedServiceAccountRef")
-    private InstallPlanStatusAttenuatedServiceAccountRef attenuatedServiceAccountRef;
+    private ObjectReference attenuatedServiceAccountRef;
     @JsonProperty("bundleLookups")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<InstallPlanStatusBundleLookups> bundleLookups = new ArrayList<>();
+    private List<BundleLookup> bundleLookups = new ArrayList<>();
     @JsonProperty("catalogSources")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private List<String> catalogSources = new ArrayList<>();
     @JsonProperty("conditions")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<InstallPlanStatusConditions> conditions = new ArrayList<>();
+    private List<InstallPlanCondition> conditions = new ArrayList<>();
     @JsonProperty("message")
     private String message;
     @JsonProperty("phase")
     private String phase;
     @JsonProperty("plan")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<InstallPlanStatusPlan> plan = new ArrayList<>();
+    private List<Step> plan = new ArrayList<>();
     @JsonProperty("startTime")
     private String startTime;
     @JsonIgnore
@@ -93,7 +93,7 @@ public class InstallPlanStatus implements Editable<InstallPlanStatusBuilder> , K
     public InstallPlanStatus() {
     }
 
-    public InstallPlanStatus(InstallPlanStatusAttenuatedServiceAccountRef attenuatedServiceAccountRef, List<InstallPlanStatusBundleLookups> bundleLookups, List<String> catalogSources, List<InstallPlanStatusConditions> conditions, String message, String phase, List<InstallPlanStatusPlan> plan, String startTime) {
+    public InstallPlanStatus(ObjectReference attenuatedServiceAccountRef, List<BundleLookup> bundleLookups, List<String> catalogSources, List<InstallPlanCondition> conditions, String message, String phase, List<Step> plan, String startTime) {
         super();
         this.attenuatedServiceAccountRef = attenuatedServiceAccountRef;
         this.bundleLookups = bundleLookups;
@@ -106,23 +106,23 @@ public InstallPlanStatus(InstallPlanStatusAttenuatedServiceAccountRef attenuated
     }
 
     @JsonProperty("attenuatedServiceAccountRef")
-    public InstallPlanStatusAttenuatedServiceAccountRef getAttenuatedServiceAccountRef() {
+    public ObjectReference getAttenuatedServiceAccountRef() {
         return attenuatedServiceAccountRef;
     }
 
     @JsonProperty("attenuatedServiceAccountRef")
-    public void setAttenuatedServiceAccountRef(InstallPlanStatusAttenuatedServiceAccountRef attenuatedServiceAccountRef) {
+    public void setAttenuatedServiceAccountRef(ObjectReference attenuatedServiceAccountRef) {
         this.attenuatedServiceAccountRef = attenuatedServiceAccountRef;
     }
 
     @JsonProperty("bundleLookups")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<InstallPlanStatusBundleLookups> getBundleLookups() {
+    public List<BundleLookup> getBundleLookups() {
         return bundleLookups;
     }
 
     @JsonProperty("bundleLookups")
-    public void setBundleLookups(List<InstallPlanStatusBundleLookups> bundleLookups) {
+    public void setBundleLookups(List<BundleLookup> bundleLookups) {
         this.bundleLookups = bundleLookups;
     }
 
@@ -139,12 +139,12 @@ public void setCatalogSources(List<String> catalogSources) {
 
     @JsonProperty("conditions")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<InstallPlanStatusConditions> getConditions() {
+    public List<InstallPlanCondition> getConditions() {
         return conditions;
     }
 
     @JsonProperty("conditions")
-    public void setConditions(List<InstallPlanStatusConditions> conditions) {
+    public void setConditions(List<InstallPlanCondition> conditions) {
         this.conditions = conditions;
     }
 
@@ -170,12 +170,12 @@ public void setPhase(String phase) {
 
     @JsonProperty("plan")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<InstallPlanStatusPlan> getPlan() {
+    public List<Step> getPlan() {
         return plan;
     }
 
     @JsonProperty("plan")
-    public void setPlan(List<InstallPlanStatusPlan> plan) {
+    public void setPlan(List<Step> plan) {
         this.plan = plan;
     }
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/InstallPlanStatusAttenuatedServiceAccountRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/InstallPlanStatusAttenuatedServiceAccountRef.java
deleted file mode 100644
index 11dff93db25..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/InstallPlanStatusAttenuatedServiceAccountRef.java
+++ /dev/null
@@ -1,192 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "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 InstallPlanStatusAttenuatedServiceAccountRef implements Editable<InstallPlanStatusAttenuatedServiceAccountRefBuilder> , 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<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public InstallPlanStatusAttenuatedServiceAccountRef() {
-    }
-
-    public InstallPlanStatusAttenuatedServiceAccountRef(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 InstallPlanStatusAttenuatedServiceAccountRefBuilder edit() {
-        return new InstallPlanStatusAttenuatedServiceAccountRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public InstallPlanStatusAttenuatedServiceAccountRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/InstallPlanStatusBLCatalogSourceRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/InstallPlanStatusBLCatalogSourceRef.java
deleted file mode 100644
index 348c10271a7..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/InstallPlanStatusBLCatalogSourceRef.java
+++ /dev/null
@@ -1,192 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "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 InstallPlanStatusBLCatalogSourceRef implements Editable<InstallPlanStatusBLCatalogSourceRefBuilder> , 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<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public InstallPlanStatusBLCatalogSourceRef() {
-    }
-
-    public InstallPlanStatusBLCatalogSourceRef(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 InstallPlanStatusBLCatalogSourceRefBuilder edit() {
-        return new InstallPlanStatusBLCatalogSourceRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public InstallPlanStatusBLCatalogSourceRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/lifecyclemanager/v1/Maintainer.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/Maintainer.java
similarity index 98%
rename from kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/lifecyclemanager/v1/Maintainer.java
rename to kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/Maintainer.java
index 335010c9c33..7f72dba1503 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/lifecyclemanager/v1/Maintainer.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/Maintainer.java
@@ -1,5 +1,5 @@
 
-package io.fabric8.openshift.api.model.operatorhub.lifecyclemanager.v1;
+package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecInstall.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/NamedInstallStrategy.java
similarity index 84%
rename from kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecInstall.java
rename to kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/NamedInstallStrategy.java
index 7e2ecba9df0..05cadb354b2 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecInstall.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/NamedInstallStrategy.java
@@ -52,11 +52,11 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class ClusterServiceVersionSpecInstall implements Editable<ClusterServiceVersionSpecInstallBuilder> , KubernetesResource
+public class NamedInstallStrategy implements Editable<NamedInstallStrategyBuilder> , KubernetesResource
 {
 
     @JsonProperty("spec")
-    private ClusterServiceVersionSpecISpec spec;
+    private StrategyDetailsDeployment spec;
     @JsonProperty("strategy")
     private String strategy;
     @JsonIgnore
@@ -66,22 +66,22 @@ public class ClusterServiceVersionSpecInstall implements Editable<ClusterService
      * No args constructor for use in serialization
      * 
      */
-    public ClusterServiceVersionSpecInstall() {
+    public NamedInstallStrategy() {
     }
 
-    public ClusterServiceVersionSpecInstall(ClusterServiceVersionSpecISpec spec, String strategy) {
+    public NamedInstallStrategy(StrategyDetailsDeployment spec, String strategy) {
         super();
         this.spec = spec;
         this.strategy = strategy;
     }
 
     @JsonProperty("spec")
-    public ClusterServiceVersionSpecISpec getSpec() {
+    public StrategyDetailsDeployment getSpec() {
         return spec;
     }
 
     @JsonProperty("spec")
-    public void setSpec(ClusterServiceVersionSpecISpec spec) {
+    public void setSpec(StrategyDetailsDeployment spec) {
         this.spec = spec;
     }
 
@@ -96,12 +96,12 @@ public void setStrategy(String strategy) {
     }
 
     @JsonIgnore
-    public ClusterServiceVersionSpecInstallBuilder edit() {
-        return new ClusterServiceVersionSpecInstallBuilder(this);
+    public NamedInstallStrategyBuilder edit() {
+        return new NamedInstallStrategyBuilder(this);
     }
 
     @JsonIgnore
-    public ClusterServiceVersionSpecInstallBuilder toBuilder() {
+    public NamedInstallStrategyBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecUSRegistryPoll.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/RegistryPoll.java
similarity index 88%
rename from kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecUSRegistryPoll.java
rename to kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/RegistryPoll.java
index c5128407da8..2cb977bc320 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecUSRegistryPoll.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/RegistryPoll.java
@@ -51,7 +51,7 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class CatalogSourceSpecUSRegistryPoll implements Editable<CatalogSourceSpecUSRegistryPollBuilder> , KubernetesResource
+public class RegistryPoll implements Editable<RegistryPollBuilder> , KubernetesResource
 {
 
     @JsonProperty("interval")
@@ -63,10 +63,10 @@ public class CatalogSourceSpecUSRegistryPoll implements Editable<CatalogSourceSp
      * No args constructor for use in serialization
      * 
      */
-    public CatalogSourceSpecUSRegistryPoll() {
+    public RegistryPoll() {
     }
 
-    public CatalogSourceSpecUSRegistryPoll(String interval) {
+    public RegistryPoll(String interval) {
         super();
         this.interval = interval;
     }
@@ -82,12 +82,12 @@ public void setInterval(String interval) {
     }
 
     @JsonIgnore
-    public CatalogSourceSpecUSRegistryPollBuilder edit() {
-        return new CatalogSourceSpecUSRegistryPollBuilder(this);
+    public RegistryPollBuilder edit() {
+        return new RegistryPollBuilder(this);
     }
 
     @JsonIgnore
-    public CatalogSourceSpecUSRegistryPollBuilder toBuilder() {
+    public RegistryPollBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceStatusRegistryService.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/RegistryServiceStatus.java
similarity index 89%
rename from kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceStatusRegistryService.java
rename to kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/RegistryServiceStatus.java
index 8f9e4168b19..bee6238f5e5 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceStatusRegistryService.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/RegistryServiceStatus.java
@@ -55,7 +55,7 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class CatalogSourceStatusRegistryService implements Editable<CatalogSourceStatusRegistryServiceBuilder> , KubernetesResource
+public class RegistryServiceStatus implements Editable<RegistryServiceStatusBuilder> , KubernetesResource
 {
 
     @JsonProperty("createdAt")
@@ -75,10 +75,10 @@ public class CatalogSourceStatusRegistryService implements Editable<CatalogSourc
      * No args constructor for use in serialization
      * 
      */
-    public CatalogSourceStatusRegistryService() {
+    public RegistryServiceStatus() {
     }
 
-    public CatalogSourceStatusRegistryService(String createdAt, String port, String protocol, String serviceName, String serviceNamespace) {
+    public RegistryServiceStatus(String createdAt, String port, String protocol, String serviceName, String serviceNamespace) {
         super();
         this.createdAt = createdAt;
         this.port = port;
@@ -138,12 +138,12 @@ public void setServiceNamespace(String serviceNamespace) {
     }
 
     @JsonIgnore
-    public CatalogSourceStatusRegistryServiceBuilder edit() {
-        return new CatalogSourceStatusRegistryServiceBuilder(this);
+    public RegistryServiceStatusBuilder edit() {
+        return new RegistryServiceStatusBuilder(this);
     }
 
     @JsonIgnore
-    public CatalogSourceStatusRegistryServiceBuilder toBuilder() {
+    public RegistryServiceStatusBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecRelatedImages.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/RelatedImage.java
similarity index 87%
rename from kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecRelatedImages.java
rename to kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/RelatedImage.java
index ee35bc569d3..c087fba40f7 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecRelatedImages.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/RelatedImage.java
@@ -52,7 +52,7 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class ClusterServiceVersionSpecRelatedImages implements Editable<ClusterServiceVersionSpecRelatedImagesBuilder> , KubernetesResource
+public class RelatedImage implements Editable<RelatedImageBuilder> , KubernetesResource
 {
 
     @JsonProperty("image")
@@ -66,10 +66,10 @@ public class ClusterServiceVersionSpecRelatedImages implements Editable<ClusterS
      * No args constructor for use in serialization
      * 
      */
-    public ClusterServiceVersionSpecRelatedImages() {
+    public RelatedImage() {
     }
 
-    public ClusterServiceVersionSpecRelatedImages(String image, String name) {
+    public RelatedImage(String image, String name) {
         super();
         this.image = image;
         this.name = name;
@@ -96,12 +96,12 @@ public void setName(String name) {
     }
 
     @JsonIgnore
-    public ClusterServiceVersionSpecRelatedImagesBuilder edit() {
-        return new ClusterServiceVersionSpecRelatedImagesBuilder(this);
+    public RelatedImageBuilder edit() {
+        return new RelatedImageBuilder(this);
     }
 
     @JsonIgnore
-    public ClusterServiceVersionSpecRelatedImagesBuilder toBuilder() {
+    public RelatedImageBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionStatusRequirementStatus.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/RequirementStatus.java
similarity index 85%
rename from kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionStatusRequirementStatus.java
rename to kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/RequirementStatus.java
index b4d65906a5d..8a12628eeb7 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionStatusRequirementStatus.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/RequirementStatus.java
@@ -60,12 +60,12 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class ClusterServiceVersionStatusRequirementStatus implements Editable<ClusterServiceVersionStatusRequirementStatusBuilder> , KubernetesResource
+public class RequirementStatus implements Editable<RequirementStatusBuilder> , KubernetesResource
 {
 
     @JsonProperty("dependents")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionStatusRSDependents> dependents = new ArrayList<>();
+    private List<DependentStatus> dependents = new ArrayList<>();
     @JsonProperty("group")
     private String group;
     @JsonProperty("kind")
@@ -87,10 +87,10 @@ public class ClusterServiceVersionStatusRequirementStatus implements Editable<Cl
      * No args constructor for use in serialization
      * 
      */
-    public ClusterServiceVersionStatusRequirementStatus() {
+    public RequirementStatus() {
     }
 
-    public ClusterServiceVersionStatusRequirementStatus(List<ClusterServiceVersionStatusRSDependents> dependents, String group, String kind, String message, String name, String status, String uuid, String version) {
+    public RequirementStatus(List<DependentStatus> dependents, String group, String kind, String message, String name, String status, String uuid, String version) {
         super();
         this.dependents = dependents;
         this.group = group;
@@ -104,12 +104,12 @@ public ClusterServiceVersionStatusRequirementStatus(List<ClusterServiceVersionSt
 
     @JsonProperty("dependents")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionStatusRSDependents> getDependents() {
+    public List<DependentStatus> getDependents() {
         return dependents;
     }
 
     @JsonProperty("dependents")
-    public void setDependents(List<ClusterServiceVersionStatusRSDependents> dependents) {
+    public void setDependents(List<DependentStatus> dependents) {
         this.dependents = dependents;
     }
 
@@ -184,12 +184,12 @@ public void setVersion(String version) {
     }
 
     @JsonIgnore
-    public ClusterServiceVersionStatusRequirementStatusBuilder edit() {
-        return new ClusterServiceVersionStatusRequirementStatusBuilder(this);
+    public RequirementStatusBuilder edit() {
+        return new RequirementStatusBuilder(this);
     }
 
     @JsonIgnore
-    public ClusterServiceVersionStatusRequirementStatusBuilder toBuilder() {
+    public RequirementStatusBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionStatusCPDInstances.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ResourceInstance.java
similarity index 87%
rename from kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionStatusCPDInstances.java
rename to kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ResourceInstance.java
index 1750399a92b..4b22df7540f 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionStatusCPDInstances.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ResourceInstance.java
@@ -52,7 +52,7 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class ClusterServiceVersionStatusCPDInstances implements Editable<ClusterServiceVersionStatusCPDInstancesBuilder> , KubernetesResource
+public class ResourceInstance implements Editable<ResourceInstanceBuilder> , KubernetesResource
 {
 
     @JsonProperty("name")
@@ -66,10 +66,10 @@ public class ClusterServiceVersionStatusCPDInstances implements Editable<Cluster
      * No args constructor for use in serialization
      * 
      */
-    public ClusterServiceVersionStatusCPDInstances() {
+    public ResourceInstance() {
     }
 
-    public ClusterServiceVersionStatusCPDInstances(String name, String namespace) {
+    public ResourceInstance(String name, String namespace) {
         super();
         this.name = name;
         this.namespace = namespace;
@@ -96,12 +96,12 @@ public void setNamespace(String namespace) {
     }
 
     @JsonIgnore
-    public ClusterServiceVersionStatusCPDInstancesBuilder edit() {
-        return new ClusterServiceVersionStatusCPDInstancesBuilder(this);
+    public ResourceInstanceBuilder edit() {
+        return new ResourceInstanceBuilder(this);
     }
 
     @JsonIgnore
-    public ClusterServiceVersionStatusCPDInstancesBuilder toBuilder() {
+    public ResourceInstanceBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionStatusCPendingDeletion.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ResourceList.java
similarity index 82%
rename from kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionStatusCPendingDeletion.java
rename to kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ResourceList.java
index e42d358be0b..0640299e30b 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionStatusCPendingDeletion.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ResourceList.java
@@ -55,14 +55,14 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class ClusterServiceVersionStatusCPendingDeletion implements Editable<ClusterServiceVersionStatusCPendingDeletionBuilder> , KubernetesResource
+public class ResourceList implements Editable<ResourceListBuilder> , KubernetesResource
 {
 
     @JsonProperty("group")
     private String group;
     @JsonProperty("instances")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionStatusCPDInstances> instances = new ArrayList<>();
+    private List<ResourceInstance> instances = new ArrayList<>();
     @JsonProperty("kind")
     private String kind;
     @JsonIgnore
@@ -72,10 +72,10 @@ public class ClusterServiceVersionStatusCPendingDeletion implements Editable<Clu
      * No args constructor for use in serialization
      * 
      */
-    public ClusterServiceVersionStatusCPendingDeletion() {
+    public ResourceList() {
     }
 
-    public ClusterServiceVersionStatusCPendingDeletion(String group, List<ClusterServiceVersionStatusCPDInstances> instances, String kind) {
+    public ResourceList(String group, List<ResourceInstance> instances, String kind) {
         super();
         this.group = group;
         this.instances = instances;
@@ -94,12 +94,12 @@ public void setGroup(String group) {
 
     @JsonProperty("instances")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionStatusCPDInstances> getInstances() {
+    public List<ResourceInstance> getInstances() {
         return instances;
     }
 
     @JsonProperty("instances")
-    public void setInstances(List<ClusterServiceVersionStatusCPDInstances> instances) {
+    public void setInstances(List<ResourceInstance> instances) {
         this.instances = instances;
     }
 
@@ -114,12 +114,12 @@ public void setKind(String kind) {
     }
 
     @JsonIgnore
-    public ClusterServiceVersionStatusCPendingDeletionBuilder edit() {
-        return new ClusterServiceVersionStatusCPendingDeletionBuilder(this);
+    public ResourceListBuilder edit() {
+        return new ResourceListBuilder(this);
     }
 
     @JsonIgnore
-    public ClusterServiceVersionStatusCPendingDeletionBuilder toBuilder() {
+    public ResourceListBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/InstallPlanStatusPlan.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/Step.java
similarity index 87%
rename from kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/InstallPlanStatusPlan.java
rename to kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/Step.java
index 813b6396624..ad773ba6128 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/InstallPlanStatusPlan.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/Step.java
@@ -54,7 +54,7 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class InstallPlanStatusPlan implements Editable<InstallPlanStatusPlanBuilder> , KubernetesResource
+public class Step implements Editable<StepBuilder> , KubernetesResource
 {
 
     @JsonProperty("optional")
@@ -62,7 +62,7 @@ public class InstallPlanStatusPlan implements Editable<InstallPlanStatusPlanBuil
     @JsonProperty("resolving")
     private String resolving;
     @JsonProperty("resource")
-    private InstallPlanStatusPResource resource;
+    private StepResource resource;
     @JsonProperty("status")
     private String status;
     @JsonIgnore
@@ -72,10 +72,10 @@ public class InstallPlanStatusPlan implements Editable<InstallPlanStatusPlanBuil
      * No args constructor for use in serialization
      * 
      */
-    public InstallPlanStatusPlan() {
+    public Step() {
     }
 
-    public InstallPlanStatusPlan(Boolean optional, String resolving, InstallPlanStatusPResource resource, String status) {
+    public Step(Boolean optional, String resolving, StepResource resource, String status) {
         super();
         this.optional = optional;
         this.resolving = resolving;
@@ -104,12 +104,12 @@ public void setResolving(String resolving) {
     }
 
     @JsonProperty("resource")
-    public InstallPlanStatusPResource getResource() {
+    public StepResource getResource() {
         return resource;
     }
 
     @JsonProperty("resource")
-    public void setResource(InstallPlanStatusPResource resource) {
+    public void setResource(StepResource resource) {
         this.resource = resource;
     }
 
@@ -124,12 +124,12 @@ public void setStatus(String status) {
     }
 
     @JsonIgnore
-    public InstallPlanStatusPlanBuilder edit() {
-        return new InstallPlanStatusPlanBuilder(this);
+    public StepBuilder edit() {
+        return new StepBuilder(this);
     }
 
     @JsonIgnore
-    public InstallPlanStatusPlanBuilder toBuilder() {
+    public StepBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/InstallPlanStatusPResource.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/StepResource.java
similarity index 91%
rename from kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/InstallPlanStatusPResource.java
rename to kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/StepResource.java
index 03736482d2b..4eeef89da71 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/InstallPlanStatusPResource.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/StepResource.java
@@ -57,7 +57,7 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class InstallPlanStatusPResource implements Editable<InstallPlanStatusPResourceBuilder> , KubernetesResource
+public class StepResource implements Editable<StepResourceBuilder> , KubernetesResource
 {
 
     @JsonProperty("group")
@@ -81,10 +81,10 @@ public class InstallPlanStatusPResource implements Editable<InstallPlanStatusPRe
      * No args constructor for use in serialization
      * 
      */
-    public InstallPlanStatusPResource() {
+    public StepResource() {
     }
 
-    public InstallPlanStatusPResource(String group, String kind, String manifest, String name, String sourceName, String sourceNamespace, String version) {
+    public StepResource(String group, String kind, String manifest, String name, String sourceName, String sourceNamespace, String version) {
         super();
         this.group = group;
         this.kind = kind;
@@ -166,12 +166,12 @@ public void setVersion(String version) {
     }
 
     @JsonIgnore
-    public InstallPlanStatusPResourceBuilder edit() {
-        return new InstallPlanStatusPResourceBuilder(this);
+    public StepResourceBuilder edit() {
+        return new StepResourceBuilder(this);
     }
 
     @JsonIgnore
-    public InstallPlanStatusPResourceBuilder toBuilder() {
+    public StepResourceBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecPermissions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/StrategyDeploymentPermissions.java
similarity index 82%
rename from kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecPermissions.java
rename to kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/StrategyDeploymentPermissions.java
index b4747a93383..cae74b56b52 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecPermissions.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/StrategyDeploymentPermissions.java
@@ -24,6 +24,7 @@
 import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
 import io.fabric8.kubernetes.api.model.PodTemplateSpec;
 import io.fabric8.kubernetes.api.model.ResourceRequirements;
+import io.fabric8.kubernetes.api.model.rbac.PolicyRule;
 import io.sundr.builder.annotations.Buildable;
 import io.sundr.builder.annotations.BuildableReference;
 import lombok.EqualsAndHashCode;
@@ -54,12 +55,12 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class ClusterServiceVersionSpecISpecPermissions implements Editable<ClusterServiceVersionSpecISpecPermissionsBuilder> , KubernetesResource
+public class StrategyDeploymentPermissions implements Editable<StrategyDeploymentPermissionsBuilder> , KubernetesResource
 {
 
     @JsonProperty("rules")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecPRules> rules = new ArrayList<>();
+    private List<PolicyRule> rules = new ArrayList<>();
     @JsonProperty("serviceAccountName")
     private String serviceAccountName;
     @JsonIgnore
@@ -69,10 +70,10 @@ public class ClusterServiceVersionSpecISpecPermissions implements Editable<Clust
      * No args constructor for use in serialization
      * 
      */
-    public ClusterServiceVersionSpecISpecPermissions() {
+    public StrategyDeploymentPermissions() {
     }
 
-    public ClusterServiceVersionSpecISpecPermissions(List<ClusterServiceVersionSpecISpecPRules> rules, String serviceAccountName) {
+    public StrategyDeploymentPermissions(List<PolicyRule> rules, String serviceAccountName) {
         super();
         this.rules = rules;
         this.serviceAccountName = serviceAccountName;
@@ -80,12 +81,12 @@ public ClusterServiceVersionSpecISpecPermissions(List<ClusterServiceVersionSpecI
 
     @JsonProperty("rules")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecPRules> getRules() {
+    public List<PolicyRule> getRules() {
         return rules;
     }
 
     @JsonProperty("rules")
-    public void setRules(List<ClusterServiceVersionSpecISpecPRules> rules) {
+    public void setRules(List<PolicyRule> rules) {
         this.rules = rules;
     }
 
@@ -100,12 +101,12 @@ public void setServiceAccountName(String serviceAccountName) {
     }
 
     @JsonIgnore
-    public ClusterServiceVersionSpecISpecPermissionsBuilder edit() {
-        return new ClusterServiceVersionSpecISpecPermissionsBuilder(this);
+    public StrategyDeploymentPermissionsBuilder edit() {
+        return new StrategyDeploymentPermissionsBuilder(this);
     }
 
     @JsonIgnore
-    public ClusterServiceVersionSpecISpecPermissionsBuilder toBuilder() {
+    public StrategyDeploymentPermissionsBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDeployments.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/StrategyDeploymentSpec.java
similarity index 83%
rename from kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDeployments.java
rename to kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/StrategyDeploymentSpec.java
index 53ba1a2a354..393249e087a 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpecDeployments.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/StrategyDeploymentSpec.java
@@ -22,6 +22,7 @@
 import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
 import io.fabric8.kubernetes.api.model.PodTemplateSpec;
 import io.fabric8.kubernetes.api.model.ResourceRequirements;
+import io.fabric8.kubernetes.api.model.apps.DeploymentSpec;
 import io.sundr.builder.annotations.Buildable;
 import io.sundr.builder.annotations.BuildableReference;
 import lombok.EqualsAndHashCode;
@@ -53,7 +54,7 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class ClusterServiceVersionSpecISpecDeployments implements Editable<ClusterServiceVersionSpecISpecDeploymentsBuilder> , KubernetesResource
+public class StrategyDeploymentSpec implements Editable<StrategyDeploymentSpecBuilder> , KubernetesResource
 {
 
     @JsonProperty("label")
@@ -62,7 +63,7 @@ public class ClusterServiceVersionSpecISpecDeployments implements Editable<Clust
     @JsonProperty("name")
     private String name;
     @JsonProperty("spec")
-    private ClusterServiceVersionSpecISpecDSpec spec;
+    private DeploymentSpec spec;
     @JsonIgnore
     private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
 
@@ -70,10 +71,10 @@ public class ClusterServiceVersionSpecISpecDeployments implements Editable<Clust
      * No args constructor for use in serialization
      * 
      */
-    public ClusterServiceVersionSpecISpecDeployments() {
+    public StrategyDeploymentSpec() {
     }
 
-    public ClusterServiceVersionSpecISpecDeployments(Map<String, String> label, String name, ClusterServiceVersionSpecISpecDSpec spec) {
+    public StrategyDeploymentSpec(Map<String, String> label, String name, DeploymentSpec spec) {
         super();
         this.label = label;
         this.name = name;
@@ -102,22 +103,22 @@ public void setName(String name) {
     }
 
     @JsonProperty("spec")
-    public ClusterServiceVersionSpecISpecDSpec getSpec() {
+    public DeploymentSpec getSpec() {
         return spec;
     }
 
     @JsonProperty("spec")
-    public void setSpec(ClusterServiceVersionSpecISpecDSpec spec) {
+    public void setSpec(DeploymentSpec spec) {
         this.spec = spec;
     }
 
     @JsonIgnore
-    public ClusterServiceVersionSpecISpecDeploymentsBuilder edit() {
-        return new ClusterServiceVersionSpecISpecDeploymentsBuilder(this);
+    public StrategyDeploymentSpecBuilder edit() {
+        return new StrategyDeploymentSpecBuilder(this);
     }
 
     @JsonIgnore
-    public ClusterServiceVersionSpecISpecDeploymentsBuilder toBuilder() {
+    public StrategyDeploymentSpecBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpec.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/StrategyDetailsDeployment.java
similarity index 73%
rename from kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpec.java
rename to kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/StrategyDetailsDeployment.java
index c853e210b39..5bb6efd912e 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecISpec.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/StrategyDetailsDeployment.java
@@ -55,18 +55,18 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class ClusterServiceVersionSpecISpec implements Editable<ClusterServiceVersionSpecISpecBuilder> , KubernetesResource
+public class StrategyDetailsDeployment implements Editable<StrategyDetailsDeploymentBuilder> , KubernetesResource
 {
 
     @JsonProperty("clusterPermissions")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecClusterPermissions> clusterPermissions = new ArrayList<>();
+    private List<StrategyDeploymentPermissions> clusterPermissions = new ArrayList<>();
     @JsonProperty("deployments")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecDeployments> deployments = new ArrayList<>();
+    private List<StrategyDeploymentSpec> deployments = new ArrayList<>();
     @JsonProperty("permissions")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecISpecPermissions> permissions = new ArrayList<>();
+    private List<StrategyDeploymentPermissions> permissions = new ArrayList<>();
     @JsonIgnore
     private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
 
@@ -74,10 +74,10 @@ public class ClusterServiceVersionSpecISpec implements Editable<ClusterServiceVe
      * No args constructor for use in serialization
      * 
      */
-    public ClusterServiceVersionSpecISpec() {
+    public StrategyDetailsDeployment() {
     }
 
-    public ClusterServiceVersionSpecISpec(List<ClusterServiceVersionSpecISpecClusterPermissions> clusterPermissions, List<ClusterServiceVersionSpecISpecDeployments> deployments, List<ClusterServiceVersionSpecISpecPermissions> permissions) {
+    public StrategyDetailsDeployment(List<StrategyDeploymentPermissions> clusterPermissions, List<StrategyDeploymentSpec> deployments, List<StrategyDeploymentPermissions> permissions) {
         super();
         this.clusterPermissions = clusterPermissions;
         this.deployments = deployments;
@@ -86,44 +86,44 @@ public ClusterServiceVersionSpecISpec(List<ClusterServiceVersionSpecISpecCluster
 
     @JsonProperty("clusterPermissions")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecClusterPermissions> getClusterPermissions() {
+    public List<StrategyDeploymentPermissions> getClusterPermissions() {
         return clusterPermissions;
     }
 
     @JsonProperty("clusterPermissions")
-    public void setClusterPermissions(List<ClusterServiceVersionSpecISpecClusterPermissions> clusterPermissions) {
+    public void setClusterPermissions(List<StrategyDeploymentPermissions> clusterPermissions) {
         this.clusterPermissions = clusterPermissions;
     }
 
     @JsonProperty("deployments")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecDeployments> getDeployments() {
+    public List<StrategyDeploymentSpec> getDeployments() {
         return deployments;
     }
 
     @JsonProperty("deployments")
-    public void setDeployments(List<ClusterServiceVersionSpecISpecDeployments> deployments) {
+    public void setDeployments(List<StrategyDeploymentSpec> deployments) {
         this.deployments = deployments;
     }
 
     @JsonProperty("permissions")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecISpecPermissions> getPermissions() {
+    public List<StrategyDeploymentPermissions> getPermissions() {
         return permissions;
     }
 
     @JsonProperty("permissions")
-    public void setPermissions(List<ClusterServiceVersionSpecISpecPermissions> permissions) {
+    public void setPermissions(List<StrategyDeploymentPermissions> permissions) {
         this.permissions = permissions;
     }
 
     @JsonIgnore
-    public ClusterServiceVersionSpecISpecBuilder edit() {
-        return new ClusterServiceVersionSpecISpecBuilder(this);
+    public StrategyDetailsDeploymentBuilder edit() {
+        return new StrategyDetailsDeploymentBuilder(this);
     }
 
     @JsonIgnore
-    public ClusterServiceVersionSpecISpecBuilder toBuilder() {
+    public StrategyDetailsDeploymentBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionStatusCatalogHealth.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionCatalogHealth.java
similarity index 84%
rename from kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionStatusCatalogHealth.java
rename to kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionCatalogHealth.java
index f8f85dcc7ba..0e9250166b9 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionStatusCatalogHealth.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionCatalogHealth.java
@@ -53,11 +53,11 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class SubscriptionStatusCatalogHealth implements Editable<SubscriptionStatusCatalogHealthBuilder> , KubernetesResource
+public class SubscriptionCatalogHealth implements Editable<SubscriptionCatalogHealthBuilder> , KubernetesResource
 {
 
     @JsonProperty("catalogSourceRef")
-    private SubscriptionStatusCHCatalogSourceRef catalogSourceRef;
+    private ObjectReference catalogSourceRef;
     @JsonProperty("healthy")
     private Boolean healthy;
     @JsonProperty("lastUpdated")
@@ -69,10 +69,10 @@ public class SubscriptionStatusCatalogHealth implements Editable<SubscriptionSta
      * No args constructor for use in serialization
      * 
      */
-    public SubscriptionStatusCatalogHealth() {
+    public SubscriptionCatalogHealth() {
     }
 
-    public SubscriptionStatusCatalogHealth(SubscriptionStatusCHCatalogSourceRef catalogSourceRef, Boolean healthy, String lastUpdated) {
+    public SubscriptionCatalogHealth(ObjectReference catalogSourceRef, Boolean healthy, String lastUpdated) {
         super();
         this.catalogSourceRef = catalogSourceRef;
         this.healthy = healthy;
@@ -80,12 +80,12 @@ public SubscriptionStatusCatalogHealth(SubscriptionStatusCHCatalogSourceRef cata
     }
 
     @JsonProperty("catalogSourceRef")
-    public SubscriptionStatusCHCatalogSourceRef getCatalogSourceRef() {
+    public ObjectReference getCatalogSourceRef() {
         return catalogSourceRef;
     }
 
     @JsonProperty("catalogSourceRef")
-    public void setCatalogSourceRef(SubscriptionStatusCHCatalogSourceRef catalogSourceRef) {
+    public void setCatalogSourceRef(ObjectReference catalogSourceRef) {
         this.catalogSourceRef = catalogSourceRef;
     }
 
@@ -110,12 +110,12 @@ public void setLastUpdated(String lastUpdated) {
     }
 
     @JsonIgnore
-    public SubscriptionStatusCatalogHealthBuilder edit() {
-        return new SubscriptionStatusCatalogHealthBuilder(this);
+    public SubscriptionCatalogHealthBuilder edit() {
+        return new SubscriptionCatalogHealthBuilder(this);
     }
 
     @JsonIgnore
-    public SubscriptionStatusCatalogHealthBuilder toBuilder() {
+    public SubscriptionCatalogHealthBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionStatusConditions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionCondition.java
similarity index 90%
rename from kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionStatusConditions.java
rename to kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionCondition.java
index 1380be8975a..f789e3e419f 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionStatusConditions.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionCondition.java
@@ -56,7 +56,7 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class SubscriptionStatusConditions implements Editable<SubscriptionStatusConditionsBuilder> , KubernetesResource
+public class SubscriptionCondition implements Editable<SubscriptionConditionBuilder> , KubernetesResource
 {
 
     @JsonProperty("lastHeartbeatTime")
@@ -78,10 +78,10 @@ public class SubscriptionStatusConditions implements Editable<SubscriptionStatus
      * No args constructor for use in serialization
      * 
      */
-    public SubscriptionStatusConditions() {
+    public SubscriptionCondition() {
     }
 
-    public SubscriptionStatusConditions(String lastHeartbeatTime, String lastTransitionTime, String message, String reason, String status, String type) {
+    public SubscriptionCondition(String lastHeartbeatTime, String lastTransitionTime, String message, String reason, String status, String type) {
         super();
         this.lastHeartbeatTime = lastHeartbeatTime;
         this.lastTransitionTime = lastTransitionTime;
@@ -152,12 +152,12 @@ public void setType(String type) {
     }
 
     @JsonIgnore
-    public SubscriptionStatusConditionsBuilder edit() {
-        return new SubscriptionStatusConditionsBuilder(this);
+    public SubscriptionConditionBuilder edit() {
+        return new SubscriptionConditionBuilder(this);
     }
 
     @JsonIgnore
-    public SubscriptionStatusConditionsBuilder toBuilder() {
+    public SubscriptionConditionBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecConfig.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionConfig.java
similarity index 73%
rename from kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecConfig.java
rename to kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionConfig.java
index bccc72e7622..0d41c025b46 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecConfig.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionConfig.java
@@ -14,7 +14,10 @@
 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.Affinity;
 import io.fabric8.kubernetes.api.model.Container;
+import io.fabric8.kubernetes.api.model.EnvFromSource;
+import io.fabric8.kubernetes.api.model.EnvVar;
 import io.fabric8.kubernetes.api.model.IntOrString;
 import io.fabric8.kubernetes.api.model.KubernetesResource;
 import io.fabric8.kubernetes.api.model.LabelSelector;
@@ -24,6 +27,9 @@
 import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
 import io.fabric8.kubernetes.api.model.PodTemplateSpec;
 import io.fabric8.kubernetes.api.model.ResourceRequirements;
+import io.fabric8.kubernetes.api.model.Toleration;
+import io.fabric8.kubernetes.api.model.Volume;
+import io.fabric8.kubernetes.api.model.VolumeMount;
 import io.sundr.builder.annotations.Buildable;
 import io.sundr.builder.annotations.BuildableReference;
 import lombok.EqualsAndHashCode;
@@ -62,36 +68,36 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class SubscriptionSpecConfig implements Editable<SubscriptionSpecConfigBuilder> , KubernetesResource
+public class SubscriptionConfig implements Editable<SubscriptionConfigBuilder> , KubernetesResource
 {
 
     @JsonProperty("affinity")
-    private SubscriptionSpecCAffinity affinity;
+    private Affinity affinity;
     @JsonProperty("annotations")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private Map<String, String> annotations = new LinkedHashMap<>();
     @JsonProperty("env")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<SubscriptionSpecCEnv> env = new ArrayList<>();
+    private List<EnvVar> env = new ArrayList<>();
     @JsonProperty("envFrom")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<SubscriptionSpecCEnvFrom> envFrom = new ArrayList<>();
+    private List<EnvFromSource> envFrom = new ArrayList<>();
     @JsonProperty("nodeSelector")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private Map<String, String> nodeSelector = new LinkedHashMap<>();
     @JsonProperty("resources")
-    private SubscriptionSpecCResources resources;
+    private ResourceRequirements resources;
     @JsonProperty("selector")
-    private SubscriptionSpecCSelector selector;
+    private LabelSelector selector;
     @JsonProperty("tolerations")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<SubscriptionSpecCTolerations> tolerations = new ArrayList<>();
+    private List<Toleration> tolerations = new ArrayList<>();
     @JsonProperty("volumeMounts")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<SubscriptionSpecCVolumeMounts> volumeMounts = new ArrayList<>();
+    private List<VolumeMount> volumeMounts = new ArrayList<>();
     @JsonProperty("volumes")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<SubscriptionSpecCVolumes> volumes = new ArrayList<>();
+    private List<Volume> volumes = new ArrayList<>();
     @JsonIgnore
     private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
 
@@ -99,10 +105,10 @@ public class SubscriptionSpecConfig implements Editable<SubscriptionSpecConfigBu
      * No args constructor for use in serialization
      * 
      */
-    public SubscriptionSpecConfig() {
+    public SubscriptionConfig() {
     }
 
-    public SubscriptionSpecConfig(SubscriptionSpecCAffinity affinity, Map<String, String> annotations, List<SubscriptionSpecCEnv> env, List<SubscriptionSpecCEnvFrom> envFrom, Map<String, String> nodeSelector, SubscriptionSpecCResources resources, SubscriptionSpecCSelector selector, List<SubscriptionSpecCTolerations> tolerations, List<SubscriptionSpecCVolumeMounts> volumeMounts, List<SubscriptionSpecCVolumes> volumes) {
+    public SubscriptionConfig(Affinity affinity, Map<String, String> annotations, List<EnvVar> env, List<EnvFromSource> envFrom, Map<String, String> nodeSelector, ResourceRequirements resources, LabelSelector selector, List<Toleration> tolerations, List<VolumeMount> volumeMounts, List<Volume> volumes) {
         super();
         this.affinity = affinity;
         this.annotations = annotations;
@@ -117,12 +123,12 @@ public SubscriptionSpecConfig(SubscriptionSpecCAffinity affinity, Map<String, St
     }
 
     @JsonProperty("affinity")
-    public SubscriptionSpecCAffinity getAffinity() {
+    public Affinity getAffinity() {
         return affinity;
     }
 
     @JsonProperty("affinity")
-    public void setAffinity(SubscriptionSpecCAffinity affinity) {
+    public void setAffinity(Affinity affinity) {
         this.affinity = affinity;
     }
 
@@ -139,23 +145,23 @@ public void setAnnotations(Map<String, String> annotations) {
 
     @JsonProperty("env")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<SubscriptionSpecCEnv> getEnv() {
+    public List<EnvVar> getEnv() {
         return env;
     }
 
     @JsonProperty("env")
-    public void setEnv(List<SubscriptionSpecCEnv> env) {
+    public void setEnv(List<EnvVar> env) {
         this.env = env;
     }
 
     @JsonProperty("envFrom")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<SubscriptionSpecCEnvFrom> getEnvFrom() {
+    public List<EnvFromSource> getEnvFrom() {
         return envFrom;
     }
 
     @JsonProperty("envFrom")
-    public void setEnvFrom(List<SubscriptionSpecCEnvFrom> envFrom) {
+    public void setEnvFrom(List<EnvFromSource> envFrom) {
         this.envFrom = envFrom;
     }
 
@@ -171,65 +177,65 @@ public void setNodeSelector(Map<String, String> nodeSelector) {
     }
 
     @JsonProperty("resources")
-    public SubscriptionSpecCResources getResources() {
+    public ResourceRequirements getResources() {
         return resources;
     }
 
     @JsonProperty("resources")
-    public void setResources(SubscriptionSpecCResources resources) {
+    public void setResources(ResourceRequirements resources) {
         this.resources = resources;
     }
 
     @JsonProperty("selector")
-    public SubscriptionSpecCSelector getSelector() {
+    public LabelSelector getSelector() {
         return selector;
     }
 
     @JsonProperty("selector")
-    public void setSelector(SubscriptionSpecCSelector selector) {
+    public void setSelector(LabelSelector selector) {
         this.selector = selector;
     }
 
     @JsonProperty("tolerations")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<SubscriptionSpecCTolerations> getTolerations() {
+    public List<Toleration> getTolerations() {
         return tolerations;
     }
 
     @JsonProperty("tolerations")
-    public void setTolerations(List<SubscriptionSpecCTolerations> tolerations) {
+    public void setTolerations(List<Toleration> tolerations) {
         this.tolerations = tolerations;
     }
 
     @JsonProperty("volumeMounts")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<SubscriptionSpecCVolumeMounts> getVolumeMounts() {
+    public List<VolumeMount> getVolumeMounts() {
         return volumeMounts;
     }
 
     @JsonProperty("volumeMounts")
-    public void setVolumeMounts(List<SubscriptionSpecCVolumeMounts> volumeMounts) {
+    public void setVolumeMounts(List<VolumeMount> volumeMounts) {
         this.volumeMounts = volumeMounts;
     }
 
     @JsonProperty("volumes")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<SubscriptionSpecCVolumes> getVolumes() {
+    public List<Volume> getVolumes() {
         return volumes;
     }
 
     @JsonProperty("volumes")
-    public void setVolumes(List<SubscriptionSpecCVolumes> volumes) {
+    public void setVolumes(List<Volume> volumes) {
         this.volumes = volumes;
     }
 
     @JsonIgnore
-    public SubscriptionSpecConfigBuilder edit() {
-        return new SubscriptionSpecConfigBuilder(this);
+    public SubscriptionConfigBuilder edit() {
+        return new SubscriptionConfigBuilder(this);
     }
 
     @JsonIgnore
-    public SubscriptionSpecConfigBuilder toBuilder() {
+    public SubscriptionConfigBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpec.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpec.java
index 3fcc4063348..e53541c0942 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpec.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpec.java
@@ -63,7 +63,7 @@ public class SubscriptionSpec implements Editable<SubscriptionSpecBuilder> , Kub
     @JsonProperty("channel")
     private String channel;
     @JsonProperty("config")
-    private SubscriptionSpecConfig config;
+    private SubscriptionConfig config;
     @JsonProperty("installPlanApproval")
     private String installPlanApproval;
     @JsonProperty("name")
@@ -84,7 +84,7 @@ public class SubscriptionSpec implements Editable<SubscriptionSpecBuilder> , Kub
     public SubscriptionSpec() {
     }
 
-    public SubscriptionSpec(String channel, SubscriptionSpecConfig config, String installPlanApproval, String name, String source, String sourceNamespace, String startingCSV) {
+    public SubscriptionSpec(String channel, SubscriptionConfig config, String installPlanApproval, String name, String source, String sourceNamespace, String startingCSV) {
         super();
         this.channel = channel;
         this.config = config;
@@ -106,12 +106,12 @@ public void setChannel(String channel) {
     }
 
     @JsonProperty("config")
-    public SubscriptionSpecConfig getConfig() {
+    public SubscriptionConfig getConfig() {
         return config;
     }
 
     @JsonProperty("config")
-    public void setConfig(SubscriptionSpecConfig config) {
+    public void setConfig(SubscriptionConfig config) {
         this.config = config;
     }
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCANAPDSIDEPMatchExpressions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCANAPDSIDEPMatchExpressions.java
deleted file mode 100644
index 96129ba0de6..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCANAPDSIDEPMatchExpressions.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "operator",
-    "values"
-})
-@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 SubscriptionSpecCANAPDSIDEPMatchExpressions implements Editable<SubscriptionSpecCANAPDSIDEPMatchExpressionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("operator")
-    private String operator;
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> values = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCANAPDSIDEPMatchExpressions() {
-    }
-
-    public SubscriptionSpecCANAPDSIDEPMatchExpressions(String key, String operator, List<String> values) {
-        super();
-        this.key = key;
-        this.operator = operator;
-        this.values = values;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("operator")
-    public String getOperator() {
-        return operator;
-    }
-
-    @JsonProperty("operator")
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getValues() {
-        return values;
-    }
-
-    @JsonProperty("values")
-    public void setValues(List<String> values) {
-        this.values = values;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCANAPDSIDEPMatchExpressionsBuilder edit() {
-        return new SubscriptionSpecCANAPDSIDEPMatchExpressionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCANAPDSIDEPMatchExpressionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCANAPDSIDEPMatchFields.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCANAPDSIDEPMatchFields.java
deleted file mode 100644
index 81ad80679a9..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCANAPDSIDEPMatchFields.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "operator",
-    "values"
-})
-@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 SubscriptionSpecCANAPDSIDEPMatchFields implements Editable<SubscriptionSpecCANAPDSIDEPMatchFieldsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("operator")
-    private String operator;
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> values = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCANAPDSIDEPMatchFields() {
-    }
-
-    public SubscriptionSpecCANAPDSIDEPMatchFields(String key, String operator, List<String> values) {
-        super();
-        this.key = key;
-        this.operator = operator;
-        this.values = values;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("operator")
-    public String getOperator() {
-        return operator;
-    }
-
-    @JsonProperty("operator")
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getValues() {
-        return values;
-    }
-
-    @JsonProperty("values")
-    public void setValues(List<String> values) {
-        this.values = values;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCANAPDSIDEPMatchFieldsBuilder edit() {
-        return new SubscriptionSpecCANAPDSIDEPMatchFieldsBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCANAPDSIDEPMatchFieldsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCANAPDSIDEPreference.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCANAPDSIDEPreference.java
deleted file mode 100644
index 722c4ebba9a..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCANAPDSIDEPreference.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "matchExpressions",
-    "matchFields"
-})
-@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 SubscriptionSpecCANAPDSIDEPreference implements Editable<SubscriptionSpecCANAPDSIDEPreferenceBuilder> , KubernetesResource
-{
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<SubscriptionSpecCANAPDSIDEPMatchExpressions> matchExpressions = new ArrayList<>();
-    @JsonProperty("matchFields")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<SubscriptionSpecCANAPDSIDEPMatchFields> matchFields = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCANAPDSIDEPreference() {
-    }
-
-    public SubscriptionSpecCANAPDSIDEPreference(List<SubscriptionSpecCANAPDSIDEPMatchExpressions> matchExpressions, List<SubscriptionSpecCANAPDSIDEPMatchFields> matchFields) {
-        super();
-        this.matchExpressions = matchExpressions;
-        this.matchFields = matchFields;
-    }
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<SubscriptionSpecCANAPDSIDEPMatchExpressions> getMatchExpressions() {
-        return matchExpressions;
-    }
-
-    @JsonProperty("matchExpressions")
-    public void setMatchExpressions(List<SubscriptionSpecCANAPDSIDEPMatchExpressions> matchExpressions) {
-        this.matchExpressions = matchExpressions;
-    }
-
-    @JsonProperty("matchFields")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<SubscriptionSpecCANAPDSIDEPMatchFields> getMatchFields() {
-        return matchFields;
-    }
-
-    @JsonProperty("matchFields")
-    public void setMatchFields(List<SubscriptionSpecCANAPDSIDEPMatchFields> matchFields) {
-        this.matchFields = matchFields;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCANAPDSIDEPreferenceBuilder edit() {
-        return new SubscriptionSpecCANAPDSIDEPreferenceBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCANAPDSIDEPreferenceBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCANAPreferredDuringSchedulingIgnoredDuringExecution.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCANAPreferredDuringSchedulingIgnoredDuringExecution.java
deleted file mode 100644
index 39eae64caca..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCANAPreferredDuringSchedulingIgnoredDuringExecution.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "preference",
-    "weight"
-})
-@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 SubscriptionSpecCANAPreferredDuringSchedulingIgnoredDuringExecution implements Editable<SubscriptionSpecCANAPreferredDuringSchedulingIgnoredDuringExecutionBuilder> , KubernetesResource
-{
-
-    @JsonProperty("preference")
-    private SubscriptionSpecCANAPDSIDEPreference preference;
-    @JsonProperty("weight")
-    private Integer weight;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCANAPreferredDuringSchedulingIgnoredDuringExecution() {
-    }
-
-    public SubscriptionSpecCANAPreferredDuringSchedulingIgnoredDuringExecution(SubscriptionSpecCANAPDSIDEPreference preference, Integer weight) {
-        super();
-        this.preference = preference;
-        this.weight = weight;
-    }
-
-    @JsonProperty("preference")
-    public SubscriptionSpecCANAPDSIDEPreference getPreference() {
-        return preference;
-    }
-
-    @JsonProperty("preference")
-    public void setPreference(SubscriptionSpecCANAPDSIDEPreference preference) {
-        this.preference = preference;
-    }
-
-    @JsonProperty("weight")
-    public Integer getWeight() {
-        return weight;
-    }
-
-    @JsonProperty("weight")
-    public void setWeight(Integer weight) {
-        this.weight = weight;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCANAPreferredDuringSchedulingIgnoredDuringExecutionBuilder edit() {
-        return new SubscriptionSpecCANAPreferredDuringSchedulingIgnoredDuringExecutionBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCANAPreferredDuringSchedulingIgnoredDuringExecutionBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCANARDSIDENSTMatchExpressions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCANARDSIDENSTMatchExpressions.java
deleted file mode 100644
index 417b04c4371..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCANARDSIDENSTMatchExpressions.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "operator",
-    "values"
-})
-@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 SubscriptionSpecCANARDSIDENSTMatchExpressions implements Editable<SubscriptionSpecCANARDSIDENSTMatchExpressionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("operator")
-    private String operator;
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> values = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCANARDSIDENSTMatchExpressions() {
-    }
-
-    public SubscriptionSpecCANARDSIDENSTMatchExpressions(String key, String operator, List<String> values) {
-        super();
-        this.key = key;
-        this.operator = operator;
-        this.values = values;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("operator")
-    public String getOperator() {
-        return operator;
-    }
-
-    @JsonProperty("operator")
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getValues() {
-        return values;
-    }
-
-    @JsonProperty("values")
-    public void setValues(List<String> values) {
-        this.values = values;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCANARDSIDENSTMatchExpressionsBuilder edit() {
-        return new SubscriptionSpecCANARDSIDENSTMatchExpressionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCANARDSIDENSTMatchExpressionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCANARDSIDENSTMatchFields.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCANARDSIDENSTMatchFields.java
deleted file mode 100644
index e097c601782..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCANARDSIDENSTMatchFields.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "operator",
-    "values"
-})
-@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 SubscriptionSpecCANARDSIDENSTMatchFields implements Editable<SubscriptionSpecCANARDSIDENSTMatchFieldsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("operator")
-    private String operator;
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> values = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCANARDSIDENSTMatchFields() {
-    }
-
-    public SubscriptionSpecCANARDSIDENSTMatchFields(String key, String operator, List<String> values) {
-        super();
-        this.key = key;
-        this.operator = operator;
-        this.values = values;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("operator")
-    public String getOperator() {
-        return operator;
-    }
-
-    @JsonProperty("operator")
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getValues() {
-        return values;
-    }
-
-    @JsonProperty("values")
-    public void setValues(List<String> values) {
-        this.values = values;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCANARDSIDENSTMatchFieldsBuilder edit() {
-        return new SubscriptionSpecCANARDSIDENSTMatchFieldsBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCANARDSIDENSTMatchFieldsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCANARDSIDENodeSelectorTerms.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCANARDSIDENodeSelectorTerms.java
deleted file mode 100644
index 2bca303ccd6..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCANARDSIDENodeSelectorTerms.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "matchExpressions",
-    "matchFields"
-})
-@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 SubscriptionSpecCANARDSIDENodeSelectorTerms implements Editable<SubscriptionSpecCANARDSIDENodeSelectorTermsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<SubscriptionSpecCANARDSIDENSTMatchExpressions> matchExpressions = new ArrayList<>();
-    @JsonProperty("matchFields")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<SubscriptionSpecCANARDSIDENSTMatchFields> matchFields = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCANARDSIDENodeSelectorTerms() {
-    }
-
-    public SubscriptionSpecCANARDSIDENodeSelectorTerms(List<SubscriptionSpecCANARDSIDENSTMatchExpressions> matchExpressions, List<SubscriptionSpecCANARDSIDENSTMatchFields> matchFields) {
-        super();
-        this.matchExpressions = matchExpressions;
-        this.matchFields = matchFields;
-    }
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<SubscriptionSpecCANARDSIDENSTMatchExpressions> getMatchExpressions() {
-        return matchExpressions;
-    }
-
-    @JsonProperty("matchExpressions")
-    public void setMatchExpressions(List<SubscriptionSpecCANARDSIDENSTMatchExpressions> matchExpressions) {
-        this.matchExpressions = matchExpressions;
-    }
-
-    @JsonProperty("matchFields")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<SubscriptionSpecCANARDSIDENSTMatchFields> getMatchFields() {
-        return matchFields;
-    }
-
-    @JsonProperty("matchFields")
-    public void setMatchFields(List<SubscriptionSpecCANARDSIDENSTMatchFields> matchFields) {
-        this.matchFields = matchFields;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCANARDSIDENodeSelectorTermsBuilder edit() {
-        return new SubscriptionSpecCANARDSIDENodeSelectorTermsBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCANARDSIDENodeSelectorTermsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCANARequiredDuringSchedulingIgnoredDuringExecution.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCANARequiredDuringSchedulingIgnoredDuringExecution.java
deleted file mode 100644
index 49bdcb427c0..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCANARequiredDuringSchedulingIgnoredDuringExecution.java
+++ /dev/null
@@ -1,112 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "nodeSelectorTerms"
-})
-@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 SubscriptionSpecCANARequiredDuringSchedulingIgnoredDuringExecution implements Editable<SubscriptionSpecCANARequiredDuringSchedulingIgnoredDuringExecutionBuilder> , KubernetesResource
-{
-
-    @JsonProperty("nodeSelectorTerms")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<SubscriptionSpecCANARDSIDENodeSelectorTerms> nodeSelectorTerms = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCANARequiredDuringSchedulingIgnoredDuringExecution() {
-    }
-
-    public SubscriptionSpecCANARequiredDuringSchedulingIgnoredDuringExecution(List<SubscriptionSpecCANARDSIDENodeSelectorTerms> nodeSelectorTerms) {
-        super();
-        this.nodeSelectorTerms = nodeSelectorTerms;
-    }
-
-    @JsonProperty("nodeSelectorTerms")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<SubscriptionSpecCANARDSIDENodeSelectorTerms> getNodeSelectorTerms() {
-        return nodeSelectorTerms;
-    }
-
-    @JsonProperty("nodeSelectorTerms")
-    public void setNodeSelectorTerms(List<SubscriptionSpecCANARDSIDENodeSelectorTerms> nodeSelectorTerms) {
-        this.nodeSelectorTerms = nodeSelectorTerms;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCANARequiredDuringSchedulingIgnoredDuringExecutionBuilder edit() {
-        return new SubscriptionSpecCANARequiredDuringSchedulingIgnoredDuringExecutionBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCANARequiredDuringSchedulingIgnoredDuringExecutionBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCANodeAffinity.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCANodeAffinity.java
deleted file mode 100644
index 742f4e17e2e..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCANodeAffinity.java
+++ /dev/null
@@ -1,126 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "preferredDuringSchedulingIgnoredDuringExecution",
-    "requiredDuringSchedulingIgnoredDuringExecution"
-})
-@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 SubscriptionSpecCANodeAffinity implements Editable<SubscriptionSpecCANodeAffinityBuilder> , KubernetesResource
-{
-
-    @JsonProperty("preferredDuringSchedulingIgnoredDuringExecution")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<SubscriptionSpecCANAPreferredDuringSchedulingIgnoredDuringExecution> preferredDuringSchedulingIgnoredDuringExecution = new ArrayList<>();
-    @JsonProperty("requiredDuringSchedulingIgnoredDuringExecution")
-    private SubscriptionSpecCANARequiredDuringSchedulingIgnoredDuringExecution requiredDuringSchedulingIgnoredDuringExecution;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCANodeAffinity() {
-    }
-
-    public SubscriptionSpecCANodeAffinity(List<SubscriptionSpecCANAPreferredDuringSchedulingIgnoredDuringExecution> preferredDuringSchedulingIgnoredDuringExecution, SubscriptionSpecCANARequiredDuringSchedulingIgnoredDuringExecution requiredDuringSchedulingIgnoredDuringExecution) {
-        super();
-        this.preferredDuringSchedulingIgnoredDuringExecution = preferredDuringSchedulingIgnoredDuringExecution;
-        this.requiredDuringSchedulingIgnoredDuringExecution = requiredDuringSchedulingIgnoredDuringExecution;
-    }
-
-    @JsonProperty("preferredDuringSchedulingIgnoredDuringExecution")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<SubscriptionSpecCANAPreferredDuringSchedulingIgnoredDuringExecution> getPreferredDuringSchedulingIgnoredDuringExecution() {
-        return preferredDuringSchedulingIgnoredDuringExecution;
-    }
-
-    @JsonProperty("preferredDuringSchedulingIgnoredDuringExecution")
-    public void setPreferredDuringSchedulingIgnoredDuringExecution(List<SubscriptionSpecCANAPreferredDuringSchedulingIgnoredDuringExecution> preferredDuringSchedulingIgnoredDuringExecution) {
-        this.preferredDuringSchedulingIgnoredDuringExecution = preferredDuringSchedulingIgnoredDuringExecution;
-    }
-
-    @JsonProperty("requiredDuringSchedulingIgnoredDuringExecution")
-    public SubscriptionSpecCANARequiredDuringSchedulingIgnoredDuringExecution getRequiredDuringSchedulingIgnoredDuringExecution() {
-        return requiredDuringSchedulingIgnoredDuringExecution;
-    }
-
-    @JsonProperty("requiredDuringSchedulingIgnoredDuringExecution")
-    public void setRequiredDuringSchedulingIgnoredDuringExecution(SubscriptionSpecCANARequiredDuringSchedulingIgnoredDuringExecution requiredDuringSchedulingIgnoredDuringExecution) {
-        this.requiredDuringSchedulingIgnoredDuringExecution = requiredDuringSchedulingIgnoredDuringExecution;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCANodeAffinityBuilder edit() {
-        return new SubscriptionSpecCANodeAffinityBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCANodeAffinityBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPAAPDSIDEPATLSMatchExpressions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPAAPDSIDEPATLSMatchExpressions.java
deleted file mode 100644
index 104b72d8a63..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPAAPDSIDEPATLSMatchExpressions.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "operator",
-    "values"
-})
-@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 SubscriptionSpecCAPAAPDSIDEPATLSMatchExpressions implements Editable<SubscriptionSpecCAPAAPDSIDEPATLSMatchExpressionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("operator")
-    private String operator;
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> values = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCAPAAPDSIDEPATLSMatchExpressions() {
-    }
-
-    public SubscriptionSpecCAPAAPDSIDEPATLSMatchExpressions(String key, String operator, List<String> values) {
-        super();
-        this.key = key;
-        this.operator = operator;
-        this.values = values;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("operator")
-    public String getOperator() {
-        return operator;
-    }
-
-    @JsonProperty("operator")
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getValues() {
-        return values;
-    }
-
-    @JsonProperty("values")
-    public void setValues(List<String> values) {
-        this.values = values;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCAPAAPDSIDEPATLSMatchExpressionsBuilder edit() {
-        return new SubscriptionSpecCAPAAPDSIDEPATLSMatchExpressionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCAPAAPDSIDEPATLSMatchExpressionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPAAPDSIDEPATLabelSelector.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPAAPDSIDEPATLabelSelector.java
deleted file mode 100644
index 72702ff59e1..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPAAPDSIDEPATLabelSelector.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "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 SubscriptionSpecCAPAAPDSIDEPATLabelSelector implements Editable<SubscriptionSpecCAPAAPDSIDEPATLabelSelectorBuilder> , KubernetesResource
-{
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<SubscriptionSpecCAPAAPDSIDEPATLSMatchExpressions> matchExpressions = new ArrayList<>();
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, String> matchLabels = new LinkedHashMap<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCAPAAPDSIDEPATLabelSelector() {
-    }
-
-    public SubscriptionSpecCAPAAPDSIDEPATLabelSelector(List<SubscriptionSpecCAPAAPDSIDEPATLSMatchExpressions> matchExpressions, Map<String, String> matchLabels) {
-        super();
-        this.matchExpressions = matchExpressions;
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<SubscriptionSpecCAPAAPDSIDEPATLSMatchExpressions> getMatchExpressions() {
-        return matchExpressions;
-    }
-
-    @JsonProperty("matchExpressions")
-    public void setMatchExpressions(List<SubscriptionSpecCAPAAPDSIDEPATLSMatchExpressions> matchExpressions) {
-        this.matchExpressions = matchExpressions;
-    }
-
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, String> getMatchLabels() {
-        return matchLabels;
-    }
-
-    @JsonProperty("matchLabels")
-    public void setMatchLabels(Map<String, String> matchLabels) {
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCAPAAPDSIDEPATLabelSelectorBuilder edit() {
-        return new SubscriptionSpecCAPAAPDSIDEPATLabelSelectorBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCAPAAPDSIDEPATLabelSelectorBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPAAPDSIDEPATNSMatchExpressions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPAAPDSIDEPATNSMatchExpressions.java
deleted file mode 100644
index 17a31c87925..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPAAPDSIDEPATNSMatchExpressions.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "operator",
-    "values"
-})
-@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 SubscriptionSpecCAPAAPDSIDEPATNSMatchExpressions implements Editable<SubscriptionSpecCAPAAPDSIDEPATNSMatchExpressionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("operator")
-    private String operator;
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> values = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCAPAAPDSIDEPATNSMatchExpressions() {
-    }
-
-    public SubscriptionSpecCAPAAPDSIDEPATNSMatchExpressions(String key, String operator, List<String> values) {
-        super();
-        this.key = key;
-        this.operator = operator;
-        this.values = values;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("operator")
-    public String getOperator() {
-        return operator;
-    }
-
-    @JsonProperty("operator")
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getValues() {
-        return values;
-    }
-
-    @JsonProperty("values")
-    public void setValues(List<String> values) {
-        this.values = values;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCAPAAPDSIDEPATNSMatchExpressionsBuilder edit() {
-        return new SubscriptionSpecCAPAAPDSIDEPATNSMatchExpressionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCAPAAPDSIDEPATNSMatchExpressionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPAAPDSIDEPATNamespaceSelector.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPAAPDSIDEPATNamespaceSelector.java
deleted file mode 100644
index 4f277c96fe9..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPAAPDSIDEPATNamespaceSelector.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "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 SubscriptionSpecCAPAAPDSIDEPATNamespaceSelector implements Editable<SubscriptionSpecCAPAAPDSIDEPATNamespaceSelectorBuilder> , KubernetesResource
-{
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<SubscriptionSpecCAPAAPDSIDEPATNSMatchExpressions> matchExpressions = new ArrayList<>();
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, String> matchLabels = new LinkedHashMap<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCAPAAPDSIDEPATNamespaceSelector() {
-    }
-
-    public SubscriptionSpecCAPAAPDSIDEPATNamespaceSelector(List<SubscriptionSpecCAPAAPDSIDEPATNSMatchExpressions> matchExpressions, Map<String, String> matchLabels) {
-        super();
-        this.matchExpressions = matchExpressions;
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<SubscriptionSpecCAPAAPDSIDEPATNSMatchExpressions> getMatchExpressions() {
-        return matchExpressions;
-    }
-
-    @JsonProperty("matchExpressions")
-    public void setMatchExpressions(List<SubscriptionSpecCAPAAPDSIDEPATNSMatchExpressions> matchExpressions) {
-        this.matchExpressions = matchExpressions;
-    }
-
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, String> getMatchLabels() {
-        return matchLabels;
-    }
-
-    @JsonProperty("matchLabels")
-    public void setMatchLabels(Map<String, String> matchLabels) {
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCAPAAPDSIDEPATNamespaceSelectorBuilder edit() {
-        return new SubscriptionSpecCAPAAPDSIDEPATNamespaceSelectorBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCAPAAPDSIDEPATNamespaceSelectorBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPAAPDSIDEPodAffinityTerm.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPAAPDSIDEPodAffinityTerm.java
deleted file mode 100644
index eb84050956a..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPAAPDSIDEPodAffinityTerm.java
+++ /dev/null
@@ -1,186 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "labelSelector",
-    "matchLabelKeys",
-    "mismatchLabelKeys",
-    "namespaceSelector",
-    "namespaces",
-    "topologyKey"
-})
-@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 SubscriptionSpecCAPAAPDSIDEPodAffinityTerm implements Editable<SubscriptionSpecCAPAAPDSIDEPodAffinityTermBuilder> , KubernetesResource
-{
-
-    @JsonProperty("labelSelector")
-    private SubscriptionSpecCAPAAPDSIDEPATLabelSelector labelSelector;
-    @JsonProperty("matchLabelKeys")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> matchLabelKeys = new ArrayList<>();
-    @JsonProperty("mismatchLabelKeys")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> mismatchLabelKeys = new ArrayList<>();
-    @JsonProperty("namespaceSelector")
-    private SubscriptionSpecCAPAAPDSIDEPATNamespaceSelector namespaceSelector;
-    @JsonProperty("namespaces")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> namespaces = new ArrayList<>();
-    @JsonProperty("topologyKey")
-    private String topologyKey;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCAPAAPDSIDEPodAffinityTerm() {
-    }
-
-    public SubscriptionSpecCAPAAPDSIDEPodAffinityTerm(SubscriptionSpecCAPAAPDSIDEPATLabelSelector labelSelector, List<String> matchLabelKeys, List<String> mismatchLabelKeys, SubscriptionSpecCAPAAPDSIDEPATNamespaceSelector namespaceSelector, List<String> namespaces, String topologyKey) {
-        super();
-        this.labelSelector = labelSelector;
-        this.matchLabelKeys = matchLabelKeys;
-        this.mismatchLabelKeys = mismatchLabelKeys;
-        this.namespaceSelector = namespaceSelector;
-        this.namespaces = namespaces;
-        this.topologyKey = topologyKey;
-    }
-
-    @JsonProperty("labelSelector")
-    public SubscriptionSpecCAPAAPDSIDEPATLabelSelector getLabelSelector() {
-        return labelSelector;
-    }
-
-    @JsonProperty("labelSelector")
-    public void setLabelSelector(SubscriptionSpecCAPAAPDSIDEPATLabelSelector labelSelector) {
-        this.labelSelector = labelSelector;
-    }
-
-    @JsonProperty("matchLabelKeys")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getMatchLabelKeys() {
-        return matchLabelKeys;
-    }
-
-    @JsonProperty("matchLabelKeys")
-    public void setMatchLabelKeys(List<String> matchLabelKeys) {
-        this.matchLabelKeys = matchLabelKeys;
-    }
-
-    @JsonProperty("mismatchLabelKeys")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getMismatchLabelKeys() {
-        return mismatchLabelKeys;
-    }
-
-    @JsonProperty("mismatchLabelKeys")
-    public void setMismatchLabelKeys(List<String> mismatchLabelKeys) {
-        this.mismatchLabelKeys = mismatchLabelKeys;
-    }
-
-    @JsonProperty("namespaceSelector")
-    public SubscriptionSpecCAPAAPDSIDEPATNamespaceSelector getNamespaceSelector() {
-        return namespaceSelector;
-    }
-
-    @JsonProperty("namespaceSelector")
-    public void setNamespaceSelector(SubscriptionSpecCAPAAPDSIDEPATNamespaceSelector namespaceSelector) {
-        this.namespaceSelector = namespaceSelector;
-    }
-
-    @JsonProperty("namespaces")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getNamespaces() {
-        return namespaces;
-    }
-
-    @JsonProperty("namespaces")
-    public void setNamespaces(List<String> namespaces) {
-        this.namespaces = namespaces;
-    }
-
-    @JsonProperty("topologyKey")
-    public String getTopologyKey() {
-        return topologyKey;
-    }
-
-    @JsonProperty("topologyKey")
-    public void setTopologyKey(String topologyKey) {
-        this.topologyKey = topologyKey;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCAPAAPDSIDEPodAffinityTermBuilder edit() {
-        return new SubscriptionSpecCAPAAPDSIDEPodAffinityTermBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCAPAAPDSIDEPodAffinityTermBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPAAPreferredDuringSchedulingIgnoredDuringExecution.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPAAPreferredDuringSchedulingIgnoredDuringExecution.java
deleted file mode 100644
index 82d600fd605..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPAAPreferredDuringSchedulingIgnoredDuringExecution.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "podAffinityTerm",
-    "weight"
-})
-@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 SubscriptionSpecCAPAAPreferredDuringSchedulingIgnoredDuringExecution implements Editable<SubscriptionSpecCAPAAPreferredDuringSchedulingIgnoredDuringExecutionBuilder> , KubernetesResource
-{
-
-    @JsonProperty("podAffinityTerm")
-    private SubscriptionSpecCAPAAPDSIDEPodAffinityTerm podAffinityTerm;
-    @JsonProperty("weight")
-    private Integer weight;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCAPAAPreferredDuringSchedulingIgnoredDuringExecution() {
-    }
-
-    public SubscriptionSpecCAPAAPreferredDuringSchedulingIgnoredDuringExecution(SubscriptionSpecCAPAAPDSIDEPodAffinityTerm podAffinityTerm, Integer weight) {
-        super();
-        this.podAffinityTerm = podAffinityTerm;
-        this.weight = weight;
-    }
-
-    @JsonProperty("podAffinityTerm")
-    public SubscriptionSpecCAPAAPDSIDEPodAffinityTerm getPodAffinityTerm() {
-        return podAffinityTerm;
-    }
-
-    @JsonProperty("podAffinityTerm")
-    public void setPodAffinityTerm(SubscriptionSpecCAPAAPDSIDEPodAffinityTerm podAffinityTerm) {
-        this.podAffinityTerm = podAffinityTerm;
-    }
-
-    @JsonProperty("weight")
-    public Integer getWeight() {
-        return weight;
-    }
-
-    @JsonProperty("weight")
-    public void setWeight(Integer weight) {
-        this.weight = weight;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCAPAAPreferredDuringSchedulingIgnoredDuringExecutionBuilder edit() {
-        return new SubscriptionSpecCAPAAPreferredDuringSchedulingIgnoredDuringExecutionBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCAPAAPreferredDuringSchedulingIgnoredDuringExecutionBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPAARDSIDELSMatchExpressions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPAARDSIDELSMatchExpressions.java
deleted file mode 100644
index adc9ac853a5..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPAARDSIDELSMatchExpressions.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "operator",
-    "values"
-})
-@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 SubscriptionSpecCAPAARDSIDELSMatchExpressions implements Editable<SubscriptionSpecCAPAARDSIDELSMatchExpressionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("operator")
-    private String operator;
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> values = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCAPAARDSIDELSMatchExpressions() {
-    }
-
-    public SubscriptionSpecCAPAARDSIDELSMatchExpressions(String key, String operator, List<String> values) {
-        super();
-        this.key = key;
-        this.operator = operator;
-        this.values = values;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("operator")
-    public String getOperator() {
-        return operator;
-    }
-
-    @JsonProperty("operator")
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getValues() {
-        return values;
-    }
-
-    @JsonProperty("values")
-    public void setValues(List<String> values) {
-        this.values = values;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCAPAARDSIDELSMatchExpressionsBuilder edit() {
-        return new SubscriptionSpecCAPAARDSIDELSMatchExpressionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCAPAARDSIDELSMatchExpressionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPAARDSIDELabelSelector.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPAARDSIDELabelSelector.java
deleted file mode 100644
index 2327dea16a9..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPAARDSIDELabelSelector.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "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 SubscriptionSpecCAPAARDSIDELabelSelector implements Editable<SubscriptionSpecCAPAARDSIDELabelSelectorBuilder> , KubernetesResource
-{
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<SubscriptionSpecCAPAARDSIDELSMatchExpressions> matchExpressions = new ArrayList<>();
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, String> matchLabels = new LinkedHashMap<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCAPAARDSIDELabelSelector() {
-    }
-
-    public SubscriptionSpecCAPAARDSIDELabelSelector(List<SubscriptionSpecCAPAARDSIDELSMatchExpressions> matchExpressions, Map<String, String> matchLabels) {
-        super();
-        this.matchExpressions = matchExpressions;
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<SubscriptionSpecCAPAARDSIDELSMatchExpressions> getMatchExpressions() {
-        return matchExpressions;
-    }
-
-    @JsonProperty("matchExpressions")
-    public void setMatchExpressions(List<SubscriptionSpecCAPAARDSIDELSMatchExpressions> matchExpressions) {
-        this.matchExpressions = matchExpressions;
-    }
-
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, String> getMatchLabels() {
-        return matchLabels;
-    }
-
-    @JsonProperty("matchLabels")
-    public void setMatchLabels(Map<String, String> matchLabels) {
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCAPAARDSIDELabelSelectorBuilder edit() {
-        return new SubscriptionSpecCAPAARDSIDELabelSelectorBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCAPAARDSIDELabelSelectorBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPAARDSIDENSMatchExpressions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPAARDSIDENSMatchExpressions.java
deleted file mode 100644
index 5127124e0fc..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPAARDSIDENSMatchExpressions.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "operator",
-    "values"
-})
-@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 SubscriptionSpecCAPAARDSIDENSMatchExpressions implements Editable<SubscriptionSpecCAPAARDSIDENSMatchExpressionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("operator")
-    private String operator;
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> values = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCAPAARDSIDENSMatchExpressions() {
-    }
-
-    public SubscriptionSpecCAPAARDSIDENSMatchExpressions(String key, String operator, List<String> values) {
-        super();
-        this.key = key;
-        this.operator = operator;
-        this.values = values;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("operator")
-    public String getOperator() {
-        return operator;
-    }
-
-    @JsonProperty("operator")
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getValues() {
-        return values;
-    }
-
-    @JsonProperty("values")
-    public void setValues(List<String> values) {
-        this.values = values;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCAPAARDSIDENSMatchExpressionsBuilder edit() {
-        return new SubscriptionSpecCAPAARDSIDENSMatchExpressionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCAPAARDSIDENSMatchExpressionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPAARDSIDENamespaceSelector.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPAARDSIDENamespaceSelector.java
deleted file mode 100644
index d4c0553c06c..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPAARDSIDENamespaceSelector.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "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 SubscriptionSpecCAPAARDSIDENamespaceSelector implements Editable<SubscriptionSpecCAPAARDSIDENamespaceSelectorBuilder> , KubernetesResource
-{
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<SubscriptionSpecCAPAARDSIDENSMatchExpressions> matchExpressions = new ArrayList<>();
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, String> matchLabels = new LinkedHashMap<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCAPAARDSIDENamespaceSelector() {
-    }
-
-    public SubscriptionSpecCAPAARDSIDENamespaceSelector(List<SubscriptionSpecCAPAARDSIDENSMatchExpressions> matchExpressions, Map<String, String> matchLabels) {
-        super();
-        this.matchExpressions = matchExpressions;
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<SubscriptionSpecCAPAARDSIDENSMatchExpressions> getMatchExpressions() {
-        return matchExpressions;
-    }
-
-    @JsonProperty("matchExpressions")
-    public void setMatchExpressions(List<SubscriptionSpecCAPAARDSIDENSMatchExpressions> matchExpressions) {
-        this.matchExpressions = matchExpressions;
-    }
-
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, String> getMatchLabels() {
-        return matchLabels;
-    }
-
-    @JsonProperty("matchLabels")
-    public void setMatchLabels(Map<String, String> matchLabels) {
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCAPAARDSIDENamespaceSelectorBuilder edit() {
-        return new SubscriptionSpecCAPAARDSIDENamespaceSelectorBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCAPAARDSIDENamespaceSelectorBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPAARequiredDuringSchedulingIgnoredDuringExecution.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPAARequiredDuringSchedulingIgnoredDuringExecution.java
deleted file mode 100644
index 4989f7b8af5..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPAARequiredDuringSchedulingIgnoredDuringExecution.java
+++ /dev/null
@@ -1,186 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "labelSelector",
-    "matchLabelKeys",
-    "mismatchLabelKeys",
-    "namespaceSelector",
-    "namespaces",
-    "topologyKey"
-})
-@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 SubscriptionSpecCAPAARequiredDuringSchedulingIgnoredDuringExecution implements Editable<SubscriptionSpecCAPAARequiredDuringSchedulingIgnoredDuringExecutionBuilder> , KubernetesResource
-{
-
-    @JsonProperty("labelSelector")
-    private SubscriptionSpecCAPAARDSIDELabelSelector labelSelector;
-    @JsonProperty("matchLabelKeys")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> matchLabelKeys = new ArrayList<>();
-    @JsonProperty("mismatchLabelKeys")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> mismatchLabelKeys = new ArrayList<>();
-    @JsonProperty("namespaceSelector")
-    private SubscriptionSpecCAPAARDSIDENamespaceSelector namespaceSelector;
-    @JsonProperty("namespaces")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> namespaces = new ArrayList<>();
-    @JsonProperty("topologyKey")
-    private String topologyKey;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCAPAARequiredDuringSchedulingIgnoredDuringExecution() {
-    }
-
-    public SubscriptionSpecCAPAARequiredDuringSchedulingIgnoredDuringExecution(SubscriptionSpecCAPAARDSIDELabelSelector labelSelector, List<String> matchLabelKeys, List<String> mismatchLabelKeys, SubscriptionSpecCAPAARDSIDENamespaceSelector namespaceSelector, List<String> namespaces, String topologyKey) {
-        super();
-        this.labelSelector = labelSelector;
-        this.matchLabelKeys = matchLabelKeys;
-        this.mismatchLabelKeys = mismatchLabelKeys;
-        this.namespaceSelector = namespaceSelector;
-        this.namespaces = namespaces;
-        this.topologyKey = topologyKey;
-    }
-
-    @JsonProperty("labelSelector")
-    public SubscriptionSpecCAPAARDSIDELabelSelector getLabelSelector() {
-        return labelSelector;
-    }
-
-    @JsonProperty("labelSelector")
-    public void setLabelSelector(SubscriptionSpecCAPAARDSIDELabelSelector labelSelector) {
-        this.labelSelector = labelSelector;
-    }
-
-    @JsonProperty("matchLabelKeys")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getMatchLabelKeys() {
-        return matchLabelKeys;
-    }
-
-    @JsonProperty("matchLabelKeys")
-    public void setMatchLabelKeys(List<String> matchLabelKeys) {
-        this.matchLabelKeys = matchLabelKeys;
-    }
-
-    @JsonProperty("mismatchLabelKeys")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getMismatchLabelKeys() {
-        return mismatchLabelKeys;
-    }
-
-    @JsonProperty("mismatchLabelKeys")
-    public void setMismatchLabelKeys(List<String> mismatchLabelKeys) {
-        this.mismatchLabelKeys = mismatchLabelKeys;
-    }
-
-    @JsonProperty("namespaceSelector")
-    public SubscriptionSpecCAPAARDSIDENamespaceSelector getNamespaceSelector() {
-        return namespaceSelector;
-    }
-
-    @JsonProperty("namespaceSelector")
-    public void setNamespaceSelector(SubscriptionSpecCAPAARDSIDENamespaceSelector namespaceSelector) {
-        this.namespaceSelector = namespaceSelector;
-    }
-
-    @JsonProperty("namespaces")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getNamespaces() {
-        return namespaces;
-    }
-
-    @JsonProperty("namespaces")
-    public void setNamespaces(List<String> namespaces) {
-        this.namespaces = namespaces;
-    }
-
-    @JsonProperty("topologyKey")
-    public String getTopologyKey() {
-        return topologyKey;
-    }
-
-    @JsonProperty("topologyKey")
-    public void setTopologyKey(String topologyKey) {
-        this.topologyKey = topologyKey;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCAPAARequiredDuringSchedulingIgnoredDuringExecutionBuilder edit() {
-        return new SubscriptionSpecCAPAARequiredDuringSchedulingIgnoredDuringExecutionBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCAPAARequiredDuringSchedulingIgnoredDuringExecutionBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPAPDSIDEPATLSMatchExpressions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPAPDSIDEPATLSMatchExpressions.java
deleted file mode 100644
index 0ff5cdf7c3f..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPAPDSIDEPATLSMatchExpressions.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "operator",
-    "values"
-})
-@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 SubscriptionSpecCAPAPDSIDEPATLSMatchExpressions implements Editable<SubscriptionSpecCAPAPDSIDEPATLSMatchExpressionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("operator")
-    private String operator;
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> values = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCAPAPDSIDEPATLSMatchExpressions() {
-    }
-
-    public SubscriptionSpecCAPAPDSIDEPATLSMatchExpressions(String key, String operator, List<String> values) {
-        super();
-        this.key = key;
-        this.operator = operator;
-        this.values = values;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("operator")
-    public String getOperator() {
-        return operator;
-    }
-
-    @JsonProperty("operator")
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getValues() {
-        return values;
-    }
-
-    @JsonProperty("values")
-    public void setValues(List<String> values) {
-        this.values = values;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCAPAPDSIDEPATLSMatchExpressionsBuilder edit() {
-        return new SubscriptionSpecCAPAPDSIDEPATLSMatchExpressionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCAPAPDSIDEPATLSMatchExpressionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPAPDSIDEPATLabelSelector.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPAPDSIDEPATLabelSelector.java
deleted file mode 100644
index 93f058b0054..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPAPDSIDEPATLabelSelector.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "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 SubscriptionSpecCAPAPDSIDEPATLabelSelector implements Editable<SubscriptionSpecCAPAPDSIDEPATLabelSelectorBuilder> , KubernetesResource
-{
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<SubscriptionSpecCAPAPDSIDEPATLSMatchExpressions> matchExpressions = new ArrayList<>();
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, String> matchLabels = new LinkedHashMap<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCAPAPDSIDEPATLabelSelector() {
-    }
-
-    public SubscriptionSpecCAPAPDSIDEPATLabelSelector(List<SubscriptionSpecCAPAPDSIDEPATLSMatchExpressions> matchExpressions, Map<String, String> matchLabels) {
-        super();
-        this.matchExpressions = matchExpressions;
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<SubscriptionSpecCAPAPDSIDEPATLSMatchExpressions> getMatchExpressions() {
-        return matchExpressions;
-    }
-
-    @JsonProperty("matchExpressions")
-    public void setMatchExpressions(List<SubscriptionSpecCAPAPDSIDEPATLSMatchExpressions> matchExpressions) {
-        this.matchExpressions = matchExpressions;
-    }
-
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, String> getMatchLabels() {
-        return matchLabels;
-    }
-
-    @JsonProperty("matchLabels")
-    public void setMatchLabels(Map<String, String> matchLabels) {
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCAPAPDSIDEPATLabelSelectorBuilder edit() {
-        return new SubscriptionSpecCAPAPDSIDEPATLabelSelectorBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCAPAPDSIDEPATLabelSelectorBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPAPDSIDEPATNSMatchExpressions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPAPDSIDEPATNSMatchExpressions.java
deleted file mode 100644
index e92657a1112..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPAPDSIDEPATNSMatchExpressions.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "operator",
-    "values"
-})
-@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 SubscriptionSpecCAPAPDSIDEPATNSMatchExpressions implements Editable<SubscriptionSpecCAPAPDSIDEPATNSMatchExpressionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("operator")
-    private String operator;
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> values = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCAPAPDSIDEPATNSMatchExpressions() {
-    }
-
-    public SubscriptionSpecCAPAPDSIDEPATNSMatchExpressions(String key, String operator, List<String> values) {
-        super();
-        this.key = key;
-        this.operator = operator;
-        this.values = values;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("operator")
-    public String getOperator() {
-        return operator;
-    }
-
-    @JsonProperty("operator")
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getValues() {
-        return values;
-    }
-
-    @JsonProperty("values")
-    public void setValues(List<String> values) {
-        this.values = values;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCAPAPDSIDEPATNSMatchExpressionsBuilder edit() {
-        return new SubscriptionSpecCAPAPDSIDEPATNSMatchExpressionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCAPAPDSIDEPATNSMatchExpressionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPAPDSIDEPATNamespaceSelector.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPAPDSIDEPATNamespaceSelector.java
deleted file mode 100644
index 854b5895beb..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPAPDSIDEPATNamespaceSelector.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "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 SubscriptionSpecCAPAPDSIDEPATNamespaceSelector implements Editable<SubscriptionSpecCAPAPDSIDEPATNamespaceSelectorBuilder> , KubernetesResource
-{
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<SubscriptionSpecCAPAPDSIDEPATNSMatchExpressions> matchExpressions = new ArrayList<>();
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, String> matchLabels = new LinkedHashMap<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCAPAPDSIDEPATNamespaceSelector() {
-    }
-
-    public SubscriptionSpecCAPAPDSIDEPATNamespaceSelector(List<SubscriptionSpecCAPAPDSIDEPATNSMatchExpressions> matchExpressions, Map<String, String> matchLabels) {
-        super();
-        this.matchExpressions = matchExpressions;
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<SubscriptionSpecCAPAPDSIDEPATNSMatchExpressions> getMatchExpressions() {
-        return matchExpressions;
-    }
-
-    @JsonProperty("matchExpressions")
-    public void setMatchExpressions(List<SubscriptionSpecCAPAPDSIDEPATNSMatchExpressions> matchExpressions) {
-        this.matchExpressions = matchExpressions;
-    }
-
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, String> getMatchLabels() {
-        return matchLabels;
-    }
-
-    @JsonProperty("matchLabels")
-    public void setMatchLabels(Map<String, String> matchLabels) {
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCAPAPDSIDEPATNamespaceSelectorBuilder edit() {
-        return new SubscriptionSpecCAPAPDSIDEPATNamespaceSelectorBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCAPAPDSIDEPATNamespaceSelectorBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPAPDSIDEPodAffinityTerm.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPAPDSIDEPodAffinityTerm.java
deleted file mode 100644
index 166e094f4a6..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPAPDSIDEPodAffinityTerm.java
+++ /dev/null
@@ -1,186 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "labelSelector",
-    "matchLabelKeys",
-    "mismatchLabelKeys",
-    "namespaceSelector",
-    "namespaces",
-    "topologyKey"
-})
-@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 SubscriptionSpecCAPAPDSIDEPodAffinityTerm implements Editable<SubscriptionSpecCAPAPDSIDEPodAffinityTermBuilder> , KubernetesResource
-{
-
-    @JsonProperty("labelSelector")
-    private SubscriptionSpecCAPAPDSIDEPATLabelSelector labelSelector;
-    @JsonProperty("matchLabelKeys")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> matchLabelKeys = new ArrayList<>();
-    @JsonProperty("mismatchLabelKeys")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> mismatchLabelKeys = new ArrayList<>();
-    @JsonProperty("namespaceSelector")
-    private SubscriptionSpecCAPAPDSIDEPATNamespaceSelector namespaceSelector;
-    @JsonProperty("namespaces")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> namespaces = new ArrayList<>();
-    @JsonProperty("topologyKey")
-    private String topologyKey;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCAPAPDSIDEPodAffinityTerm() {
-    }
-
-    public SubscriptionSpecCAPAPDSIDEPodAffinityTerm(SubscriptionSpecCAPAPDSIDEPATLabelSelector labelSelector, List<String> matchLabelKeys, List<String> mismatchLabelKeys, SubscriptionSpecCAPAPDSIDEPATNamespaceSelector namespaceSelector, List<String> namespaces, String topologyKey) {
-        super();
-        this.labelSelector = labelSelector;
-        this.matchLabelKeys = matchLabelKeys;
-        this.mismatchLabelKeys = mismatchLabelKeys;
-        this.namespaceSelector = namespaceSelector;
-        this.namespaces = namespaces;
-        this.topologyKey = topologyKey;
-    }
-
-    @JsonProperty("labelSelector")
-    public SubscriptionSpecCAPAPDSIDEPATLabelSelector getLabelSelector() {
-        return labelSelector;
-    }
-
-    @JsonProperty("labelSelector")
-    public void setLabelSelector(SubscriptionSpecCAPAPDSIDEPATLabelSelector labelSelector) {
-        this.labelSelector = labelSelector;
-    }
-
-    @JsonProperty("matchLabelKeys")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getMatchLabelKeys() {
-        return matchLabelKeys;
-    }
-
-    @JsonProperty("matchLabelKeys")
-    public void setMatchLabelKeys(List<String> matchLabelKeys) {
-        this.matchLabelKeys = matchLabelKeys;
-    }
-
-    @JsonProperty("mismatchLabelKeys")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getMismatchLabelKeys() {
-        return mismatchLabelKeys;
-    }
-
-    @JsonProperty("mismatchLabelKeys")
-    public void setMismatchLabelKeys(List<String> mismatchLabelKeys) {
-        this.mismatchLabelKeys = mismatchLabelKeys;
-    }
-
-    @JsonProperty("namespaceSelector")
-    public SubscriptionSpecCAPAPDSIDEPATNamespaceSelector getNamespaceSelector() {
-        return namespaceSelector;
-    }
-
-    @JsonProperty("namespaceSelector")
-    public void setNamespaceSelector(SubscriptionSpecCAPAPDSIDEPATNamespaceSelector namespaceSelector) {
-        this.namespaceSelector = namespaceSelector;
-    }
-
-    @JsonProperty("namespaces")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getNamespaces() {
-        return namespaces;
-    }
-
-    @JsonProperty("namespaces")
-    public void setNamespaces(List<String> namespaces) {
-        this.namespaces = namespaces;
-    }
-
-    @JsonProperty("topologyKey")
-    public String getTopologyKey() {
-        return topologyKey;
-    }
-
-    @JsonProperty("topologyKey")
-    public void setTopologyKey(String topologyKey) {
-        this.topologyKey = topologyKey;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCAPAPDSIDEPodAffinityTermBuilder edit() {
-        return new SubscriptionSpecCAPAPDSIDEPodAffinityTermBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCAPAPDSIDEPodAffinityTermBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPAPreferredDuringSchedulingIgnoredDuringExecution.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPAPreferredDuringSchedulingIgnoredDuringExecution.java
deleted file mode 100644
index 05308789add..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPAPreferredDuringSchedulingIgnoredDuringExecution.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "podAffinityTerm",
-    "weight"
-})
-@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 SubscriptionSpecCAPAPreferredDuringSchedulingIgnoredDuringExecution implements Editable<SubscriptionSpecCAPAPreferredDuringSchedulingIgnoredDuringExecutionBuilder> , KubernetesResource
-{
-
-    @JsonProperty("podAffinityTerm")
-    private SubscriptionSpecCAPAPDSIDEPodAffinityTerm podAffinityTerm;
-    @JsonProperty("weight")
-    private Integer weight;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCAPAPreferredDuringSchedulingIgnoredDuringExecution() {
-    }
-
-    public SubscriptionSpecCAPAPreferredDuringSchedulingIgnoredDuringExecution(SubscriptionSpecCAPAPDSIDEPodAffinityTerm podAffinityTerm, Integer weight) {
-        super();
-        this.podAffinityTerm = podAffinityTerm;
-        this.weight = weight;
-    }
-
-    @JsonProperty("podAffinityTerm")
-    public SubscriptionSpecCAPAPDSIDEPodAffinityTerm getPodAffinityTerm() {
-        return podAffinityTerm;
-    }
-
-    @JsonProperty("podAffinityTerm")
-    public void setPodAffinityTerm(SubscriptionSpecCAPAPDSIDEPodAffinityTerm podAffinityTerm) {
-        this.podAffinityTerm = podAffinityTerm;
-    }
-
-    @JsonProperty("weight")
-    public Integer getWeight() {
-        return weight;
-    }
-
-    @JsonProperty("weight")
-    public void setWeight(Integer weight) {
-        this.weight = weight;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCAPAPreferredDuringSchedulingIgnoredDuringExecutionBuilder edit() {
-        return new SubscriptionSpecCAPAPreferredDuringSchedulingIgnoredDuringExecutionBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCAPAPreferredDuringSchedulingIgnoredDuringExecutionBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPARDSIDELSMatchExpressions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPARDSIDELSMatchExpressions.java
deleted file mode 100644
index 44f45ec6c05..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPARDSIDELSMatchExpressions.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "operator",
-    "values"
-})
-@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 SubscriptionSpecCAPARDSIDELSMatchExpressions implements Editable<SubscriptionSpecCAPARDSIDELSMatchExpressionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("operator")
-    private String operator;
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> values = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCAPARDSIDELSMatchExpressions() {
-    }
-
-    public SubscriptionSpecCAPARDSIDELSMatchExpressions(String key, String operator, List<String> values) {
-        super();
-        this.key = key;
-        this.operator = operator;
-        this.values = values;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("operator")
-    public String getOperator() {
-        return operator;
-    }
-
-    @JsonProperty("operator")
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getValues() {
-        return values;
-    }
-
-    @JsonProperty("values")
-    public void setValues(List<String> values) {
-        this.values = values;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCAPARDSIDELSMatchExpressionsBuilder edit() {
-        return new SubscriptionSpecCAPARDSIDELSMatchExpressionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCAPARDSIDELSMatchExpressionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPARDSIDELabelSelector.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPARDSIDELabelSelector.java
deleted file mode 100644
index 0bae3c3462c..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPARDSIDELabelSelector.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "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 SubscriptionSpecCAPARDSIDELabelSelector implements Editable<SubscriptionSpecCAPARDSIDELabelSelectorBuilder> , KubernetesResource
-{
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<SubscriptionSpecCAPARDSIDELSMatchExpressions> matchExpressions = new ArrayList<>();
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, String> matchLabels = new LinkedHashMap<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCAPARDSIDELabelSelector() {
-    }
-
-    public SubscriptionSpecCAPARDSIDELabelSelector(List<SubscriptionSpecCAPARDSIDELSMatchExpressions> matchExpressions, Map<String, String> matchLabels) {
-        super();
-        this.matchExpressions = matchExpressions;
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<SubscriptionSpecCAPARDSIDELSMatchExpressions> getMatchExpressions() {
-        return matchExpressions;
-    }
-
-    @JsonProperty("matchExpressions")
-    public void setMatchExpressions(List<SubscriptionSpecCAPARDSIDELSMatchExpressions> matchExpressions) {
-        this.matchExpressions = matchExpressions;
-    }
-
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, String> getMatchLabels() {
-        return matchLabels;
-    }
-
-    @JsonProperty("matchLabels")
-    public void setMatchLabels(Map<String, String> matchLabels) {
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCAPARDSIDELabelSelectorBuilder edit() {
-        return new SubscriptionSpecCAPARDSIDELabelSelectorBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCAPARDSIDELabelSelectorBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPARDSIDENSMatchExpressions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPARDSIDENSMatchExpressions.java
deleted file mode 100644
index 78325a5e03f..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPARDSIDENSMatchExpressions.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "operator",
-    "values"
-})
-@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 SubscriptionSpecCAPARDSIDENSMatchExpressions implements Editable<SubscriptionSpecCAPARDSIDENSMatchExpressionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("operator")
-    private String operator;
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> values = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCAPARDSIDENSMatchExpressions() {
-    }
-
-    public SubscriptionSpecCAPARDSIDENSMatchExpressions(String key, String operator, List<String> values) {
-        super();
-        this.key = key;
-        this.operator = operator;
-        this.values = values;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("operator")
-    public String getOperator() {
-        return operator;
-    }
-
-    @JsonProperty("operator")
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getValues() {
-        return values;
-    }
-
-    @JsonProperty("values")
-    public void setValues(List<String> values) {
-        this.values = values;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCAPARDSIDENSMatchExpressionsBuilder edit() {
-        return new SubscriptionSpecCAPARDSIDENSMatchExpressionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCAPARDSIDENSMatchExpressionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPARDSIDENamespaceSelector.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPARDSIDENamespaceSelector.java
deleted file mode 100644
index 943616d1971..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPARDSIDENamespaceSelector.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "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 SubscriptionSpecCAPARDSIDENamespaceSelector implements Editable<SubscriptionSpecCAPARDSIDENamespaceSelectorBuilder> , KubernetesResource
-{
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<SubscriptionSpecCAPARDSIDENSMatchExpressions> matchExpressions = new ArrayList<>();
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, String> matchLabels = new LinkedHashMap<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCAPARDSIDENamespaceSelector() {
-    }
-
-    public SubscriptionSpecCAPARDSIDENamespaceSelector(List<SubscriptionSpecCAPARDSIDENSMatchExpressions> matchExpressions, Map<String, String> matchLabels) {
-        super();
-        this.matchExpressions = matchExpressions;
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<SubscriptionSpecCAPARDSIDENSMatchExpressions> getMatchExpressions() {
-        return matchExpressions;
-    }
-
-    @JsonProperty("matchExpressions")
-    public void setMatchExpressions(List<SubscriptionSpecCAPARDSIDENSMatchExpressions> matchExpressions) {
-        this.matchExpressions = matchExpressions;
-    }
-
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, String> getMatchLabels() {
-        return matchLabels;
-    }
-
-    @JsonProperty("matchLabels")
-    public void setMatchLabels(Map<String, String> matchLabels) {
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCAPARDSIDENamespaceSelectorBuilder edit() {
-        return new SubscriptionSpecCAPARDSIDENamespaceSelectorBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCAPARDSIDENamespaceSelectorBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPARequiredDuringSchedulingIgnoredDuringExecution.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPARequiredDuringSchedulingIgnoredDuringExecution.java
deleted file mode 100644
index 9204e0ed792..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPARequiredDuringSchedulingIgnoredDuringExecution.java
+++ /dev/null
@@ -1,186 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "labelSelector",
-    "matchLabelKeys",
-    "mismatchLabelKeys",
-    "namespaceSelector",
-    "namespaces",
-    "topologyKey"
-})
-@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 SubscriptionSpecCAPARequiredDuringSchedulingIgnoredDuringExecution implements Editable<SubscriptionSpecCAPARequiredDuringSchedulingIgnoredDuringExecutionBuilder> , KubernetesResource
-{
-
-    @JsonProperty("labelSelector")
-    private SubscriptionSpecCAPARDSIDELabelSelector labelSelector;
-    @JsonProperty("matchLabelKeys")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> matchLabelKeys = new ArrayList<>();
-    @JsonProperty("mismatchLabelKeys")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> mismatchLabelKeys = new ArrayList<>();
-    @JsonProperty("namespaceSelector")
-    private SubscriptionSpecCAPARDSIDENamespaceSelector namespaceSelector;
-    @JsonProperty("namespaces")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> namespaces = new ArrayList<>();
-    @JsonProperty("topologyKey")
-    private String topologyKey;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCAPARequiredDuringSchedulingIgnoredDuringExecution() {
-    }
-
-    public SubscriptionSpecCAPARequiredDuringSchedulingIgnoredDuringExecution(SubscriptionSpecCAPARDSIDELabelSelector labelSelector, List<String> matchLabelKeys, List<String> mismatchLabelKeys, SubscriptionSpecCAPARDSIDENamespaceSelector namespaceSelector, List<String> namespaces, String topologyKey) {
-        super();
-        this.labelSelector = labelSelector;
-        this.matchLabelKeys = matchLabelKeys;
-        this.mismatchLabelKeys = mismatchLabelKeys;
-        this.namespaceSelector = namespaceSelector;
-        this.namespaces = namespaces;
-        this.topologyKey = topologyKey;
-    }
-
-    @JsonProperty("labelSelector")
-    public SubscriptionSpecCAPARDSIDELabelSelector getLabelSelector() {
-        return labelSelector;
-    }
-
-    @JsonProperty("labelSelector")
-    public void setLabelSelector(SubscriptionSpecCAPARDSIDELabelSelector labelSelector) {
-        this.labelSelector = labelSelector;
-    }
-
-    @JsonProperty("matchLabelKeys")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getMatchLabelKeys() {
-        return matchLabelKeys;
-    }
-
-    @JsonProperty("matchLabelKeys")
-    public void setMatchLabelKeys(List<String> matchLabelKeys) {
-        this.matchLabelKeys = matchLabelKeys;
-    }
-
-    @JsonProperty("mismatchLabelKeys")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getMismatchLabelKeys() {
-        return mismatchLabelKeys;
-    }
-
-    @JsonProperty("mismatchLabelKeys")
-    public void setMismatchLabelKeys(List<String> mismatchLabelKeys) {
-        this.mismatchLabelKeys = mismatchLabelKeys;
-    }
-
-    @JsonProperty("namespaceSelector")
-    public SubscriptionSpecCAPARDSIDENamespaceSelector getNamespaceSelector() {
-        return namespaceSelector;
-    }
-
-    @JsonProperty("namespaceSelector")
-    public void setNamespaceSelector(SubscriptionSpecCAPARDSIDENamespaceSelector namespaceSelector) {
-        this.namespaceSelector = namespaceSelector;
-    }
-
-    @JsonProperty("namespaces")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getNamespaces() {
-        return namespaces;
-    }
-
-    @JsonProperty("namespaces")
-    public void setNamespaces(List<String> namespaces) {
-        this.namespaces = namespaces;
-    }
-
-    @JsonProperty("topologyKey")
-    public String getTopologyKey() {
-        return topologyKey;
-    }
-
-    @JsonProperty("topologyKey")
-    public void setTopologyKey(String topologyKey) {
-        this.topologyKey = topologyKey;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCAPARequiredDuringSchedulingIgnoredDuringExecutionBuilder edit() {
-        return new SubscriptionSpecCAPARequiredDuringSchedulingIgnoredDuringExecutionBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCAPARequiredDuringSchedulingIgnoredDuringExecutionBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPodAffinity.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPodAffinity.java
deleted file mode 100644
index 34c8603c508..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPodAffinity.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "preferredDuringSchedulingIgnoredDuringExecution",
-    "requiredDuringSchedulingIgnoredDuringExecution"
-})
-@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 SubscriptionSpecCAPodAffinity implements Editable<SubscriptionSpecCAPodAffinityBuilder> , KubernetesResource
-{
-
-    @JsonProperty("preferredDuringSchedulingIgnoredDuringExecution")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<SubscriptionSpecCAPAPreferredDuringSchedulingIgnoredDuringExecution> preferredDuringSchedulingIgnoredDuringExecution = new ArrayList<>();
-    @JsonProperty("requiredDuringSchedulingIgnoredDuringExecution")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<SubscriptionSpecCAPARequiredDuringSchedulingIgnoredDuringExecution> requiredDuringSchedulingIgnoredDuringExecution = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCAPodAffinity() {
-    }
-
-    public SubscriptionSpecCAPodAffinity(List<SubscriptionSpecCAPAPreferredDuringSchedulingIgnoredDuringExecution> preferredDuringSchedulingIgnoredDuringExecution, List<SubscriptionSpecCAPARequiredDuringSchedulingIgnoredDuringExecution> requiredDuringSchedulingIgnoredDuringExecution) {
-        super();
-        this.preferredDuringSchedulingIgnoredDuringExecution = preferredDuringSchedulingIgnoredDuringExecution;
-        this.requiredDuringSchedulingIgnoredDuringExecution = requiredDuringSchedulingIgnoredDuringExecution;
-    }
-
-    @JsonProperty("preferredDuringSchedulingIgnoredDuringExecution")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<SubscriptionSpecCAPAPreferredDuringSchedulingIgnoredDuringExecution> getPreferredDuringSchedulingIgnoredDuringExecution() {
-        return preferredDuringSchedulingIgnoredDuringExecution;
-    }
-
-    @JsonProperty("preferredDuringSchedulingIgnoredDuringExecution")
-    public void setPreferredDuringSchedulingIgnoredDuringExecution(List<SubscriptionSpecCAPAPreferredDuringSchedulingIgnoredDuringExecution> preferredDuringSchedulingIgnoredDuringExecution) {
-        this.preferredDuringSchedulingIgnoredDuringExecution = preferredDuringSchedulingIgnoredDuringExecution;
-    }
-
-    @JsonProperty("requiredDuringSchedulingIgnoredDuringExecution")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<SubscriptionSpecCAPARequiredDuringSchedulingIgnoredDuringExecution> getRequiredDuringSchedulingIgnoredDuringExecution() {
-        return requiredDuringSchedulingIgnoredDuringExecution;
-    }
-
-    @JsonProperty("requiredDuringSchedulingIgnoredDuringExecution")
-    public void setRequiredDuringSchedulingIgnoredDuringExecution(List<SubscriptionSpecCAPARequiredDuringSchedulingIgnoredDuringExecution> requiredDuringSchedulingIgnoredDuringExecution) {
-        this.requiredDuringSchedulingIgnoredDuringExecution = requiredDuringSchedulingIgnoredDuringExecution;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCAPodAffinityBuilder edit() {
-        return new SubscriptionSpecCAPodAffinityBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCAPodAffinityBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPodAntiAffinity.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPodAntiAffinity.java
deleted file mode 100644
index ab50ec63e38..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAPodAntiAffinity.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "preferredDuringSchedulingIgnoredDuringExecution",
-    "requiredDuringSchedulingIgnoredDuringExecution"
-})
-@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 SubscriptionSpecCAPodAntiAffinity implements Editable<SubscriptionSpecCAPodAntiAffinityBuilder> , KubernetesResource
-{
-
-    @JsonProperty("preferredDuringSchedulingIgnoredDuringExecution")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<SubscriptionSpecCAPAAPreferredDuringSchedulingIgnoredDuringExecution> preferredDuringSchedulingIgnoredDuringExecution = new ArrayList<>();
-    @JsonProperty("requiredDuringSchedulingIgnoredDuringExecution")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<SubscriptionSpecCAPAARequiredDuringSchedulingIgnoredDuringExecution> requiredDuringSchedulingIgnoredDuringExecution = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCAPodAntiAffinity() {
-    }
-
-    public SubscriptionSpecCAPodAntiAffinity(List<SubscriptionSpecCAPAAPreferredDuringSchedulingIgnoredDuringExecution> preferredDuringSchedulingIgnoredDuringExecution, List<SubscriptionSpecCAPAARequiredDuringSchedulingIgnoredDuringExecution> requiredDuringSchedulingIgnoredDuringExecution) {
-        super();
-        this.preferredDuringSchedulingIgnoredDuringExecution = preferredDuringSchedulingIgnoredDuringExecution;
-        this.requiredDuringSchedulingIgnoredDuringExecution = requiredDuringSchedulingIgnoredDuringExecution;
-    }
-
-    @JsonProperty("preferredDuringSchedulingIgnoredDuringExecution")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<SubscriptionSpecCAPAAPreferredDuringSchedulingIgnoredDuringExecution> getPreferredDuringSchedulingIgnoredDuringExecution() {
-        return preferredDuringSchedulingIgnoredDuringExecution;
-    }
-
-    @JsonProperty("preferredDuringSchedulingIgnoredDuringExecution")
-    public void setPreferredDuringSchedulingIgnoredDuringExecution(List<SubscriptionSpecCAPAAPreferredDuringSchedulingIgnoredDuringExecution> preferredDuringSchedulingIgnoredDuringExecution) {
-        this.preferredDuringSchedulingIgnoredDuringExecution = preferredDuringSchedulingIgnoredDuringExecution;
-    }
-
-    @JsonProperty("requiredDuringSchedulingIgnoredDuringExecution")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<SubscriptionSpecCAPAARequiredDuringSchedulingIgnoredDuringExecution> getRequiredDuringSchedulingIgnoredDuringExecution() {
-        return requiredDuringSchedulingIgnoredDuringExecution;
-    }
-
-    @JsonProperty("requiredDuringSchedulingIgnoredDuringExecution")
-    public void setRequiredDuringSchedulingIgnoredDuringExecution(List<SubscriptionSpecCAPAARequiredDuringSchedulingIgnoredDuringExecution> requiredDuringSchedulingIgnoredDuringExecution) {
-        this.requiredDuringSchedulingIgnoredDuringExecution = requiredDuringSchedulingIgnoredDuringExecution;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCAPodAntiAffinityBuilder edit() {
-        return new SubscriptionSpecCAPodAntiAffinityBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCAPodAntiAffinityBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAffinity.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAffinity.java
deleted file mode 100644
index 136453252be..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCAffinity.java
+++ /dev/null
@@ -1,136 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "nodeAffinity",
-    "podAffinity",
-    "podAntiAffinity"
-})
-@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 SubscriptionSpecCAffinity implements Editable<SubscriptionSpecCAffinityBuilder> , KubernetesResource
-{
-
-    @JsonProperty("nodeAffinity")
-    private SubscriptionSpecCANodeAffinity nodeAffinity;
-    @JsonProperty("podAffinity")
-    private SubscriptionSpecCAPodAffinity podAffinity;
-    @JsonProperty("podAntiAffinity")
-    private SubscriptionSpecCAPodAntiAffinity podAntiAffinity;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCAffinity() {
-    }
-
-    public SubscriptionSpecCAffinity(SubscriptionSpecCANodeAffinity nodeAffinity, SubscriptionSpecCAPodAffinity podAffinity, SubscriptionSpecCAPodAntiAffinity podAntiAffinity) {
-        super();
-        this.nodeAffinity = nodeAffinity;
-        this.podAffinity = podAffinity;
-        this.podAntiAffinity = podAntiAffinity;
-    }
-
-    @JsonProperty("nodeAffinity")
-    public SubscriptionSpecCANodeAffinity getNodeAffinity() {
-        return nodeAffinity;
-    }
-
-    @JsonProperty("nodeAffinity")
-    public void setNodeAffinity(SubscriptionSpecCANodeAffinity nodeAffinity) {
-        this.nodeAffinity = nodeAffinity;
-    }
-
-    @JsonProperty("podAffinity")
-    public SubscriptionSpecCAPodAffinity getPodAffinity() {
-        return podAffinity;
-    }
-
-    @JsonProperty("podAffinity")
-    public void setPodAffinity(SubscriptionSpecCAPodAffinity podAffinity) {
-        this.podAffinity = podAffinity;
-    }
-
-    @JsonProperty("podAntiAffinity")
-    public SubscriptionSpecCAPodAntiAffinity getPodAntiAffinity() {
-        return podAntiAffinity;
-    }
-
-    @JsonProperty("podAntiAffinity")
-    public void setPodAntiAffinity(SubscriptionSpecCAPodAntiAffinity podAntiAffinity) {
-        this.podAntiAffinity = podAntiAffinity;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCAffinityBuilder edit() {
-        return new SubscriptionSpecCAffinityBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCAffinityBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCEFConfigMapRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCEFConfigMapRef.java
deleted file mode 100644
index 24b91f5806e..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCEFConfigMapRef.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name",
-    "optional"
-})
-@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 SubscriptionSpecCEFConfigMapRef implements Editable<SubscriptionSpecCEFConfigMapRefBuilder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("optional")
-    private Boolean optional;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCEFConfigMapRef() {
-    }
-
-    public SubscriptionSpecCEFConfigMapRef(String name, Boolean optional) {
-        super();
-        this.name = name;
-        this.optional = optional;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("optional")
-    public Boolean getOptional() {
-        return optional;
-    }
-
-    @JsonProperty("optional")
-    public void setOptional(Boolean optional) {
-        this.optional = optional;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCEFConfigMapRefBuilder edit() {
-        return new SubscriptionSpecCEFConfigMapRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCEFConfigMapRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCEFSecretRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCEFSecretRef.java
deleted file mode 100644
index 28ea906c801..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCEFSecretRef.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name",
-    "optional"
-})
-@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 SubscriptionSpecCEFSecretRef implements Editable<SubscriptionSpecCEFSecretRefBuilder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("optional")
-    private Boolean optional;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCEFSecretRef() {
-    }
-
-    public SubscriptionSpecCEFSecretRef(String name, Boolean optional) {
-        super();
-        this.name = name;
-        this.optional = optional;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("optional")
-    public Boolean getOptional() {
-        return optional;
-    }
-
-    @JsonProperty("optional")
-    public void setOptional(Boolean optional) {
-        this.optional = optional;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCEFSecretRefBuilder edit() {
-        return new SubscriptionSpecCEFSecretRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCEFSecretRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCEVFConfigMapKeyRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCEVFConfigMapKeyRef.java
deleted file mode 100644
index 873636fa4b2..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCEVFConfigMapKeyRef.java
+++ /dev/null
@@ -1,136 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "name",
-    "optional"
-})
-@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 SubscriptionSpecCEVFConfigMapKeyRef implements Editable<SubscriptionSpecCEVFConfigMapKeyRefBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("optional")
-    private Boolean optional;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCEVFConfigMapKeyRef() {
-    }
-
-    public SubscriptionSpecCEVFConfigMapKeyRef(String key, String name, Boolean optional) {
-        super();
-        this.key = key;
-        this.name = name;
-        this.optional = optional;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("optional")
-    public Boolean getOptional() {
-        return optional;
-    }
-
-    @JsonProperty("optional")
-    public void setOptional(Boolean optional) {
-        this.optional = optional;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCEVFConfigMapKeyRefBuilder edit() {
-        return new SubscriptionSpecCEVFConfigMapKeyRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCEVFConfigMapKeyRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCEVFFieldRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCEVFFieldRef.java
deleted file mode 100644
index 51ff12956c4..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCEVFFieldRef.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "apiVersion",
-    "fieldPath"
-})
-@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 SubscriptionSpecCEVFFieldRef implements Editable<SubscriptionSpecCEVFFieldRefBuilder> , KubernetesResource
-{
-
-    @JsonProperty("apiVersion")
-    private String apiVersion;
-    @JsonProperty("fieldPath")
-    private String fieldPath;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCEVFFieldRef() {
-    }
-
-    public SubscriptionSpecCEVFFieldRef(String apiVersion, String fieldPath) {
-        super();
-        this.apiVersion = apiVersion;
-        this.fieldPath = fieldPath;
-    }
-
-    @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;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCEVFFieldRefBuilder edit() {
-        return new SubscriptionSpecCEVFFieldRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCEVFFieldRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCEVFResourceFieldRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCEVFResourceFieldRef.java
deleted file mode 100644
index a82d16f6c77..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCEVFResourceFieldRef.java
+++ /dev/null
@@ -1,138 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "containerName",
-    "divisor",
-    "resource"
-})
-@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 SubscriptionSpecCEVFResourceFieldRef implements Editable<SubscriptionSpecCEVFResourceFieldRefBuilder> , KubernetesResource
-{
-
-    @JsonProperty("containerName")
-    private String containerName;
-    @JsonProperty("divisor")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object divisor;
-    @JsonProperty("resource")
-    private String resource;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCEVFResourceFieldRef() {
-    }
-
-    public SubscriptionSpecCEVFResourceFieldRef(String containerName, Object divisor, String resource) {
-        super();
-        this.containerName = containerName;
-        this.divisor = divisor;
-        this.resource = resource;
-    }
-
-    @JsonProperty("containerName")
-    public String getContainerName() {
-        return containerName;
-    }
-
-    @JsonProperty("containerName")
-    public void setContainerName(String containerName) {
-        this.containerName = containerName;
-    }
-
-    @JsonProperty("divisor")
-    public Object getDivisor() {
-        return divisor;
-    }
-
-    @JsonProperty("divisor")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setDivisor(Object divisor) {
-        this.divisor = divisor;
-    }
-
-    @JsonProperty("resource")
-    public String getResource() {
-        return resource;
-    }
-
-    @JsonProperty("resource")
-    public void setResource(String resource) {
-        this.resource = resource;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCEVFResourceFieldRefBuilder edit() {
-        return new SubscriptionSpecCEVFResourceFieldRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCEVFResourceFieldRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCEVFSecretKeyRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCEVFSecretKeyRef.java
deleted file mode 100644
index e536ce1f99b..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCEVFSecretKeyRef.java
+++ /dev/null
@@ -1,136 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "name",
-    "optional"
-})
-@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 SubscriptionSpecCEVFSecretKeyRef implements Editable<SubscriptionSpecCEVFSecretKeyRefBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("optional")
-    private Boolean optional;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCEVFSecretKeyRef() {
-    }
-
-    public SubscriptionSpecCEVFSecretKeyRef(String key, String name, Boolean optional) {
-        super();
-        this.key = key;
-        this.name = name;
-        this.optional = optional;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("optional")
-    public Boolean getOptional() {
-        return optional;
-    }
-
-    @JsonProperty("optional")
-    public void setOptional(Boolean optional) {
-        this.optional = optional;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCEVFSecretKeyRefBuilder edit() {
-        return new SubscriptionSpecCEVFSecretKeyRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCEVFSecretKeyRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCEValueFrom.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCEValueFrom.java
deleted file mode 100644
index b58267dcac8..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCEValueFrom.java
+++ /dev/null
@@ -1,150 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "configMapKeyRef",
-    "fieldRef",
-    "resourceFieldRef",
-    "secretKeyRef"
-})
-@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 SubscriptionSpecCEValueFrom implements Editable<SubscriptionSpecCEValueFromBuilder> , KubernetesResource
-{
-
-    @JsonProperty("configMapKeyRef")
-    private SubscriptionSpecCEVFConfigMapKeyRef configMapKeyRef;
-    @JsonProperty("fieldRef")
-    private SubscriptionSpecCEVFFieldRef fieldRef;
-    @JsonProperty("resourceFieldRef")
-    private SubscriptionSpecCEVFResourceFieldRef resourceFieldRef;
-    @JsonProperty("secretKeyRef")
-    private SubscriptionSpecCEVFSecretKeyRef secretKeyRef;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCEValueFrom() {
-    }
-
-    public SubscriptionSpecCEValueFrom(SubscriptionSpecCEVFConfigMapKeyRef configMapKeyRef, SubscriptionSpecCEVFFieldRef fieldRef, SubscriptionSpecCEVFResourceFieldRef resourceFieldRef, SubscriptionSpecCEVFSecretKeyRef secretKeyRef) {
-        super();
-        this.configMapKeyRef = configMapKeyRef;
-        this.fieldRef = fieldRef;
-        this.resourceFieldRef = resourceFieldRef;
-        this.secretKeyRef = secretKeyRef;
-    }
-
-    @JsonProperty("configMapKeyRef")
-    public SubscriptionSpecCEVFConfigMapKeyRef getConfigMapKeyRef() {
-        return configMapKeyRef;
-    }
-
-    @JsonProperty("configMapKeyRef")
-    public void setConfigMapKeyRef(SubscriptionSpecCEVFConfigMapKeyRef configMapKeyRef) {
-        this.configMapKeyRef = configMapKeyRef;
-    }
-
-    @JsonProperty("fieldRef")
-    public SubscriptionSpecCEVFFieldRef getFieldRef() {
-        return fieldRef;
-    }
-
-    @JsonProperty("fieldRef")
-    public void setFieldRef(SubscriptionSpecCEVFFieldRef fieldRef) {
-        this.fieldRef = fieldRef;
-    }
-
-    @JsonProperty("resourceFieldRef")
-    public SubscriptionSpecCEVFResourceFieldRef getResourceFieldRef() {
-        return resourceFieldRef;
-    }
-
-    @JsonProperty("resourceFieldRef")
-    public void setResourceFieldRef(SubscriptionSpecCEVFResourceFieldRef resourceFieldRef) {
-        this.resourceFieldRef = resourceFieldRef;
-    }
-
-    @JsonProperty("secretKeyRef")
-    public SubscriptionSpecCEVFSecretKeyRef getSecretKeyRef() {
-        return secretKeyRef;
-    }
-
-    @JsonProperty("secretKeyRef")
-    public void setSecretKeyRef(SubscriptionSpecCEVFSecretKeyRef secretKeyRef) {
-        this.secretKeyRef = secretKeyRef;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCEValueFromBuilder edit() {
-        return new SubscriptionSpecCEValueFromBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCEValueFromBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCEnv.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCEnv.java
deleted file mode 100644
index 843b98e4b32..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCEnv.java
+++ /dev/null
@@ -1,136 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name",
-    "value",
-    "valueFrom"
-})
-@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 SubscriptionSpecCEnv implements Editable<SubscriptionSpecCEnvBuilder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("value")
-    private String value;
-    @JsonProperty("valueFrom")
-    private SubscriptionSpecCEValueFrom valueFrom;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCEnv() {
-    }
-
-    public SubscriptionSpecCEnv(String name, String value, SubscriptionSpecCEValueFrom valueFrom) {
-        super();
-        this.name = name;
-        this.value = value;
-        this.valueFrom = valueFrom;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("value")
-    public String getValue() {
-        return value;
-    }
-
-    @JsonProperty("value")
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    @JsonProperty("valueFrom")
-    public SubscriptionSpecCEValueFrom getValueFrom() {
-        return valueFrom;
-    }
-
-    @JsonProperty("valueFrom")
-    public void setValueFrom(SubscriptionSpecCEValueFrom valueFrom) {
-        this.valueFrom = valueFrom;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCEnvBuilder edit() {
-        return new SubscriptionSpecCEnvBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCEnvBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCEnvFrom.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCEnvFrom.java
deleted file mode 100644
index 874fce5a299..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCEnvFrom.java
+++ /dev/null
@@ -1,136 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "configMapRef",
-    "prefix",
-    "secretRef"
-})
-@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 SubscriptionSpecCEnvFrom implements Editable<SubscriptionSpecCEnvFromBuilder> , KubernetesResource
-{
-
-    @JsonProperty("configMapRef")
-    private SubscriptionSpecCEFConfigMapRef configMapRef;
-    @JsonProperty("prefix")
-    private String prefix;
-    @JsonProperty("secretRef")
-    private SubscriptionSpecCEFSecretRef secretRef;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCEnvFrom() {
-    }
-
-    public SubscriptionSpecCEnvFrom(SubscriptionSpecCEFConfigMapRef configMapRef, String prefix, SubscriptionSpecCEFSecretRef secretRef) {
-        super();
-        this.configMapRef = configMapRef;
-        this.prefix = prefix;
-        this.secretRef = secretRef;
-    }
-
-    @JsonProperty("configMapRef")
-    public SubscriptionSpecCEFConfigMapRef getConfigMapRef() {
-        return configMapRef;
-    }
-
-    @JsonProperty("configMapRef")
-    public void setConfigMapRef(SubscriptionSpecCEFConfigMapRef configMapRef) {
-        this.configMapRef = configMapRef;
-    }
-
-    @JsonProperty("prefix")
-    public String getPrefix() {
-        return prefix;
-    }
-
-    @JsonProperty("prefix")
-    public void setPrefix(String prefix) {
-        this.prefix = prefix;
-    }
-
-    @JsonProperty("secretRef")
-    public SubscriptionSpecCEFSecretRef getSecretRef() {
-        return secretRef;
-    }
-
-    @JsonProperty("secretRef")
-    public void setSecretRef(SubscriptionSpecCEFSecretRef secretRef) {
-        this.secretRef = secretRef;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCEnvFromBuilder edit() {
-        return new SubscriptionSpecCEnvFromBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCEnvFromBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCRClaims.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCRClaims.java
deleted file mode 100644
index 676be16cc19..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCRClaims.java
+++ /dev/null
@@ -1,108 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name"
-})
-@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 SubscriptionSpecCRClaims implements Editable<SubscriptionSpecCRClaimsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCRClaims() {
-    }
-
-    public SubscriptionSpecCRClaims(String name) {
-        super();
-        this.name = name;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCRClaimsBuilder edit() {
-        return new SubscriptionSpecCRClaimsBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCRClaimsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCResources.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCResources.java
deleted file mode 100644
index 11e3b30f6c7..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCResources.java
+++ /dev/null
@@ -1,148 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "claims",
-    "limits",
-    "requests"
-})
-@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 SubscriptionSpecCResources implements Editable<SubscriptionSpecCResourcesBuilder> , KubernetesResource
-{
-
-    @JsonProperty("claims")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<SubscriptionSpecCRClaims> claims = new ArrayList<>();
-    @JsonProperty("limits")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializerForMap.class)
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, Object> limits = new LinkedHashMap<>();
-    @JsonProperty("requests")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializerForMap.class)
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, Object> requests = new LinkedHashMap<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCResources() {
-    }
-
-    public SubscriptionSpecCResources(List<SubscriptionSpecCRClaims> claims, Map<String, Object> limits, Map<String, Object> requests) {
-        super();
-        this.claims = claims;
-        this.limits = limits;
-        this.requests = requests;
-    }
-
-    @JsonProperty("claims")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<SubscriptionSpecCRClaims> getClaims() {
-        return claims;
-    }
-
-    @JsonProperty("claims")
-    public void setClaims(List<SubscriptionSpecCRClaims> claims) {
-        this.claims = claims;
-    }
-
-    @JsonProperty("limits")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, Object> getLimits() {
-        return limits;
-    }
-
-    @JsonProperty("limits")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializerForMap.class)
-    public void setLimits(Map<String, Object> limits) {
-        this.limits = limits;
-    }
-
-    @JsonProperty("requests")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, Object> getRequests() {
-        return requests;
-    }
-
-    @JsonProperty("requests")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializerForMap.class)
-    public void setRequests(Map<String, Object> requests) {
-        this.requests = requests;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCResourcesBuilder edit() {
-        return new SubscriptionSpecCResourcesBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCResourcesBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCSMatchExpressions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCSMatchExpressions.java
deleted file mode 100644
index 62b50a6d769..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCSMatchExpressions.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "operator",
-    "values"
-})
-@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 SubscriptionSpecCSMatchExpressions implements Editable<SubscriptionSpecCSMatchExpressionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("operator")
-    private String operator;
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> values = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCSMatchExpressions() {
-    }
-
-    public SubscriptionSpecCSMatchExpressions(String key, String operator, List<String> values) {
-        super();
-        this.key = key;
-        this.operator = operator;
-        this.values = values;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("operator")
-    public String getOperator() {
-        return operator;
-    }
-
-    @JsonProperty("operator")
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getValues() {
-        return values;
-    }
-
-    @JsonProperty("values")
-    public void setValues(List<String> values) {
-        this.values = values;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCSMatchExpressionsBuilder edit() {
-        return new SubscriptionSpecCSMatchExpressionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCSMatchExpressionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCSelector.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCSelector.java
deleted file mode 100644
index 19bdddaa703..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCSelector.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "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 SubscriptionSpecCSelector implements Editable<SubscriptionSpecCSelectorBuilder> , KubernetesResource
-{
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<SubscriptionSpecCSMatchExpressions> matchExpressions = new ArrayList<>();
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, String> matchLabels = new LinkedHashMap<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCSelector() {
-    }
-
-    public SubscriptionSpecCSelector(List<SubscriptionSpecCSMatchExpressions> matchExpressions, Map<String, String> matchLabels) {
-        super();
-        this.matchExpressions = matchExpressions;
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<SubscriptionSpecCSMatchExpressions> getMatchExpressions() {
-        return matchExpressions;
-    }
-
-    @JsonProperty("matchExpressions")
-    public void setMatchExpressions(List<SubscriptionSpecCSMatchExpressions> matchExpressions) {
-        this.matchExpressions = matchExpressions;
-    }
-
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, String> getMatchLabels() {
-        return matchLabels;
-    }
-
-    @JsonProperty("matchLabels")
-    public void setMatchLabels(Map<String, String> matchLabels) {
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCSelectorBuilder edit() {
-        return new SubscriptionSpecCSelectorBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCSelectorBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCTolerations.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCTolerations.java
deleted file mode 100644
index 1f1786a039e..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCTolerations.java
+++ /dev/null
@@ -1,164 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "effect",
-    "key",
-    "operator",
-    "tolerationSeconds",
-    "value"
-})
-@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 SubscriptionSpecCTolerations implements Editable<SubscriptionSpecCTolerationsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("effect")
-    private String effect;
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("operator")
-    private String operator;
-    @JsonProperty("tolerationSeconds")
-    private Long tolerationSeconds;
-    @JsonProperty("value")
-    private String value;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCTolerations() {
-    }
-
-    public SubscriptionSpecCTolerations(String effect, String key, String operator, Long tolerationSeconds, String value) {
-        super();
-        this.effect = effect;
-        this.key = key;
-        this.operator = operator;
-        this.tolerationSeconds = tolerationSeconds;
-        this.value = value;
-    }
-
-    @JsonProperty("effect")
-    public String getEffect() {
-        return effect;
-    }
-
-    @JsonProperty("effect")
-    public void setEffect(String effect) {
-        this.effect = effect;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("operator")
-    public String getOperator() {
-        return operator;
-    }
-
-    @JsonProperty("operator")
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    @JsonProperty("tolerationSeconds")
-    public Long getTolerationSeconds() {
-        return tolerationSeconds;
-    }
-
-    @JsonProperty("tolerationSeconds")
-    public void setTolerationSeconds(Long tolerationSeconds) {
-        this.tolerationSeconds = tolerationSeconds;
-    }
-
-    @JsonProperty("value")
-    public String getValue() {
-        return value;
-    }
-
-    @JsonProperty("value")
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCTolerationsBuilder edit() {
-        return new SubscriptionSpecCTolerationsBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCTolerationsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVAwsElasticBlockStore.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVAwsElasticBlockStore.java
deleted file mode 100644
index 5cff5735566..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVAwsElasticBlockStore.java
+++ /dev/null
@@ -1,150 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "fsType",
-    "partition",
-    "readOnly",
-    "volumeID"
-})
-@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 SubscriptionSpecCVAwsElasticBlockStore implements Editable<SubscriptionSpecCVAwsElasticBlockStoreBuilder> , KubernetesResource
-{
-
-    @JsonProperty("fsType")
-    private String fsType;
-    @JsonProperty("partition")
-    private Integer partition;
-    @JsonProperty("readOnly")
-    private Boolean readOnly;
-    @JsonProperty("volumeID")
-    private String volumeID;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVAwsElasticBlockStore() {
-    }
-
-    public SubscriptionSpecCVAwsElasticBlockStore(String fsType, Integer partition, Boolean readOnly, String volumeID) {
-        super();
-        this.fsType = fsType;
-        this.partition = partition;
-        this.readOnly = readOnly;
-        this.volumeID = volumeID;
-    }
-
-    @JsonProperty("fsType")
-    public String getFsType() {
-        return fsType;
-    }
-
-    @JsonProperty("fsType")
-    public void setFsType(String fsType) {
-        this.fsType = fsType;
-    }
-
-    @JsonProperty("partition")
-    public Integer getPartition() {
-        return partition;
-    }
-
-    @JsonProperty("partition")
-    public void setPartition(Integer partition) {
-        this.partition = partition;
-    }
-
-    @JsonProperty("readOnly")
-    public Boolean getReadOnly() {
-        return readOnly;
-    }
-
-    @JsonProperty("readOnly")
-    public void setReadOnly(Boolean readOnly) {
-        this.readOnly = readOnly;
-    }
-
-    @JsonProperty("volumeID")
-    public String getVolumeID() {
-        return volumeID;
-    }
-
-    @JsonProperty("volumeID")
-    public void setVolumeID(String volumeID) {
-        this.volumeID = volumeID;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVAwsElasticBlockStoreBuilder edit() {
-        return new SubscriptionSpecCVAwsElasticBlockStoreBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVAwsElasticBlockStoreBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVAzureDisk.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVAzureDisk.java
deleted file mode 100644
index 9059195f6ec..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVAzureDisk.java
+++ /dev/null
@@ -1,178 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "kind",
-    "cachingMode",
-    "diskName",
-    "diskURI",
-    "fsType",
-    "readOnly"
-})
-@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 SubscriptionSpecCVAzureDisk implements Editable<SubscriptionSpecCVAzureDiskBuilder> , KubernetesResource
-{
-
-    @JsonProperty("cachingMode")
-    private String cachingMode;
-    @JsonProperty("diskName")
-    private String diskName;
-    @JsonProperty("diskURI")
-    private String diskURI;
-    @JsonProperty("fsType")
-    private String fsType;
-    @JsonProperty("kind")
-    private String kind;
-    @JsonProperty("readOnly")
-    private Boolean readOnly;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVAzureDisk() {
-    }
-
-    public SubscriptionSpecCVAzureDisk(String cachingMode, String diskName, String diskURI, String fsType, String kind, Boolean readOnly) {
-        super();
-        this.cachingMode = cachingMode;
-        this.diskName = diskName;
-        this.diskURI = diskURI;
-        this.fsType = fsType;
-        this.kind = kind;
-        this.readOnly = readOnly;
-    }
-
-    @JsonProperty("cachingMode")
-    public String getCachingMode() {
-        return cachingMode;
-    }
-
-    @JsonProperty("cachingMode")
-    public void setCachingMode(String cachingMode) {
-        this.cachingMode = cachingMode;
-    }
-
-    @JsonProperty("diskName")
-    public String getDiskName() {
-        return diskName;
-    }
-
-    @JsonProperty("diskName")
-    public void setDiskName(String diskName) {
-        this.diskName = diskName;
-    }
-
-    @JsonProperty("diskURI")
-    public String getDiskURI() {
-        return diskURI;
-    }
-
-    @JsonProperty("diskURI")
-    public void setDiskURI(String diskURI) {
-        this.diskURI = diskURI;
-    }
-
-    @JsonProperty("fsType")
-    public String getFsType() {
-        return fsType;
-    }
-
-    @JsonProperty("fsType")
-    public void setFsType(String fsType) {
-        this.fsType = fsType;
-    }
-
-    @JsonProperty("kind")
-    public String getKind() {
-        return kind;
-    }
-
-    @JsonProperty("kind")
-    public void setKind(String kind) {
-        this.kind = kind;
-    }
-
-    @JsonProperty("readOnly")
-    public Boolean getReadOnly() {
-        return readOnly;
-    }
-
-    @JsonProperty("readOnly")
-    public void setReadOnly(Boolean readOnly) {
-        this.readOnly = readOnly;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVAzureDiskBuilder edit() {
-        return new SubscriptionSpecCVAzureDiskBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVAzureDiskBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVAzureFile.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVAzureFile.java
deleted file mode 100644
index e693f09d0be..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVAzureFile.java
+++ /dev/null
@@ -1,136 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "readOnly",
-    "secretName",
-    "shareName"
-})
-@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 SubscriptionSpecCVAzureFile implements Editable<SubscriptionSpecCVAzureFileBuilder> , KubernetesResource
-{
-
-    @JsonProperty("readOnly")
-    private Boolean readOnly;
-    @JsonProperty("secretName")
-    private String secretName;
-    @JsonProperty("shareName")
-    private String shareName;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVAzureFile() {
-    }
-
-    public SubscriptionSpecCVAzureFile(Boolean readOnly, String secretName, String shareName) {
-        super();
-        this.readOnly = readOnly;
-        this.secretName = secretName;
-        this.shareName = shareName;
-    }
-
-    @JsonProperty("readOnly")
-    public Boolean getReadOnly() {
-        return readOnly;
-    }
-
-    @JsonProperty("readOnly")
-    public void setReadOnly(Boolean readOnly) {
-        this.readOnly = readOnly;
-    }
-
-    @JsonProperty("secretName")
-    public String getSecretName() {
-        return secretName;
-    }
-
-    @JsonProperty("secretName")
-    public void setSecretName(String secretName) {
-        this.secretName = secretName;
-    }
-
-    @JsonProperty("shareName")
-    public String getShareName() {
-        return shareName;
-    }
-
-    @JsonProperty("shareName")
-    public void setShareName(String shareName) {
-        this.shareName = shareName;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVAzureFileBuilder edit() {
-        return new SubscriptionSpecCVAzureFileBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVAzureFileBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVCMItems.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVCMItems.java
deleted file mode 100644
index 4dee2e547f2..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVCMItems.java
+++ /dev/null
@@ -1,136 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "mode",
-    "path"
-})
-@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 SubscriptionSpecCVCMItems implements Editable<SubscriptionSpecCVCMItemsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("mode")
-    private Integer mode;
-    @JsonProperty("path")
-    private String path;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVCMItems() {
-    }
-
-    public SubscriptionSpecCVCMItems(String key, Integer mode, String path) {
-        super();
-        this.key = key;
-        this.mode = mode;
-        this.path = path;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("mode")
-    public Integer getMode() {
-        return mode;
-    }
-
-    @JsonProperty("mode")
-    public void setMode(Integer mode) {
-        this.mode = mode;
-    }
-
-    @JsonProperty("path")
-    public String getPath() {
-        return path;
-    }
-
-    @JsonProperty("path")
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVCMItemsBuilder edit() {
-        return new SubscriptionSpecCVCMItemsBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVCMItemsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVCNodePublishSecretRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVCNodePublishSecretRef.java
deleted file mode 100644
index f06dd51c879..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVCNodePublishSecretRef.java
+++ /dev/null
@@ -1,108 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name"
-})
-@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 SubscriptionSpecCVCNodePublishSecretRef implements Editable<SubscriptionSpecCVCNodePublishSecretRefBuilder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVCNodePublishSecretRef() {
-    }
-
-    public SubscriptionSpecCVCNodePublishSecretRef(String name) {
-        super();
-        this.name = name;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVCNodePublishSecretRefBuilder edit() {
-        return new SubscriptionSpecCVCNodePublishSecretRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVCNodePublishSecretRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVCSecretRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVCSecretRef.java
deleted file mode 100644
index 86614eb2e34..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVCSecretRef.java
+++ /dev/null
@@ -1,108 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name"
-})
-@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 SubscriptionSpecCVCSecretRef implements Editable<SubscriptionSpecCVCSecretRefBuilder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVCSecretRef() {
-    }
-
-    public SubscriptionSpecCVCSecretRef(String name) {
-        super();
-        this.name = name;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVCSecretRefBuilder edit() {
-        return new SubscriptionSpecCVCSecretRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVCSecretRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVCSecretRef_1.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVCSecretRef_1.java
deleted file mode 100644
index da30d93d0c1..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVCSecretRef_1.java
+++ /dev/null
@@ -1,108 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name"
-})
-@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 SubscriptionSpecCVCSecretRef_1 implements Editable<SubscriptionSpecCVCSecretRef_1Builder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVCSecretRef_1() {
-    }
-
-    public SubscriptionSpecCVCSecretRef_1(String name) {
-        super();
-        this.name = name;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVCSecretRef_1Builder edit() {
-        return new SubscriptionSpecCVCSecretRef_1Builder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVCSecretRef_1Builder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVCephfs.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVCephfs.java
deleted file mode 100644
index 90d2cf2c115..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVCephfs.java
+++ /dev/null
@@ -1,182 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "monitors",
-    "path",
-    "readOnly",
-    "secretFile",
-    "secretRef",
-    "user"
-})
-@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 SubscriptionSpecCVCephfs implements Editable<SubscriptionSpecCVCephfsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("monitors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> monitors = new ArrayList<>();
-    @JsonProperty("path")
-    private String path;
-    @JsonProperty("readOnly")
-    private Boolean readOnly;
-    @JsonProperty("secretFile")
-    private String secretFile;
-    @JsonProperty("secretRef")
-    private SubscriptionSpecCVCSecretRef secretRef;
-    @JsonProperty("user")
-    private String user;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVCephfs() {
-    }
-
-    public SubscriptionSpecCVCephfs(List<String> monitors, String path, Boolean readOnly, String secretFile, SubscriptionSpecCVCSecretRef secretRef, String user) {
-        super();
-        this.monitors = monitors;
-        this.path = path;
-        this.readOnly = readOnly;
-        this.secretFile = secretFile;
-        this.secretRef = secretRef;
-        this.user = user;
-    }
-
-    @JsonProperty("monitors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getMonitors() {
-        return monitors;
-    }
-
-    @JsonProperty("monitors")
-    public void setMonitors(List<String> monitors) {
-        this.monitors = monitors;
-    }
-
-    @JsonProperty("path")
-    public String getPath() {
-        return path;
-    }
-
-    @JsonProperty("path")
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @JsonProperty("readOnly")
-    public Boolean getReadOnly() {
-        return readOnly;
-    }
-
-    @JsonProperty("readOnly")
-    public void setReadOnly(Boolean readOnly) {
-        this.readOnly = readOnly;
-    }
-
-    @JsonProperty("secretFile")
-    public String getSecretFile() {
-        return secretFile;
-    }
-
-    @JsonProperty("secretFile")
-    public void setSecretFile(String secretFile) {
-        this.secretFile = secretFile;
-    }
-
-    @JsonProperty("secretRef")
-    public SubscriptionSpecCVCSecretRef getSecretRef() {
-        return secretRef;
-    }
-
-    @JsonProperty("secretRef")
-    public void setSecretRef(SubscriptionSpecCVCSecretRef secretRef) {
-        this.secretRef = secretRef;
-    }
-
-    @JsonProperty("user")
-    public String getUser() {
-        return user;
-    }
-
-    @JsonProperty("user")
-    public void setUser(String user) {
-        this.user = user;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVCephfsBuilder edit() {
-        return new SubscriptionSpecCVCephfsBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVCephfsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVCinder.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVCinder.java
deleted file mode 100644
index 0aed333b954..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVCinder.java
+++ /dev/null
@@ -1,150 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "fsType",
-    "readOnly",
-    "secretRef",
-    "volumeID"
-})
-@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 SubscriptionSpecCVCinder implements Editable<SubscriptionSpecCVCinderBuilder> , KubernetesResource
-{
-
-    @JsonProperty("fsType")
-    private String fsType;
-    @JsonProperty("readOnly")
-    private Boolean readOnly;
-    @JsonProperty("secretRef")
-    private SubscriptionSpecCVCSecretRef_1 secretRef;
-    @JsonProperty("volumeID")
-    private String volumeID;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVCinder() {
-    }
-
-    public SubscriptionSpecCVCinder(String fsType, Boolean readOnly, SubscriptionSpecCVCSecretRef_1 secretRef, String volumeID) {
-        super();
-        this.fsType = fsType;
-        this.readOnly = readOnly;
-        this.secretRef = secretRef;
-        this.volumeID = volumeID;
-    }
-
-    @JsonProperty("fsType")
-    public String getFsType() {
-        return fsType;
-    }
-
-    @JsonProperty("fsType")
-    public void setFsType(String fsType) {
-        this.fsType = fsType;
-    }
-
-    @JsonProperty("readOnly")
-    public Boolean getReadOnly() {
-        return readOnly;
-    }
-
-    @JsonProperty("readOnly")
-    public void setReadOnly(Boolean readOnly) {
-        this.readOnly = readOnly;
-    }
-
-    @JsonProperty("secretRef")
-    public SubscriptionSpecCVCSecretRef_1 getSecretRef() {
-        return secretRef;
-    }
-
-    @JsonProperty("secretRef")
-    public void setSecretRef(SubscriptionSpecCVCSecretRef_1 secretRef) {
-        this.secretRef = secretRef;
-    }
-
-    @JsonProperty("volumeID")
-    public String getVolumeID() {
-        return volumeID;
-    }
-
-    @JsonProperty("volumeID")
-    public void setVolumeID(String volumeID) {
-        this.volumeID = volumeID;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVCinderBuilder edit() {
-        return new SubscriptionSpecCVCinderBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVCinderBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVConfigMap.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVConfigMap.java
deleted file mode 100644
index 17de9c14e59..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVConfigMap.java
+++ /dev/null
@@ -1,154 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "defaultMode",
-    "items",
-    "name",
-    "optional"
-})
-@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 SubscriptionSpecCVConfigMap implements Editable<SubscriptionSpecCVConfigMapBuilder> , KubernetesResource
-{
-
-    @JsonProperty("defaultMode")
-    private Integer defaultMode;
-    @JsonProperty("items")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<SubscriptionSpecCVCMItems> items = new ArrayList<>();
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("optional")
-    private Boolean optional;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVConfigMap() {
-    }
-
-    public SubscriptionSpecCVConfigMap(Integer defaultMode, List<SubscriptionSpecCVCMItems> items, String name, Boolean optional) {
-        super();
-        this.defaultMode = defaultMode;
-        this.items = items;
-        this.name = name;
-        this.optional = optional;
-    }
-
-    @JsonProperty("defaultMode")
-    public Integer getDefaultMode() {
-        return defaultMode;
-    }
-
-    @JsonProperty("defaultMode")
-    public void setDefaultMode(Integer defaultMode) {
-        this.defaultMode = defaultMode;
-    }
-
-    @JsonProperty("items")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<SubscriptionSpecCVCMItems> getItems() {
-        return items;
-    }
-
-    @JsonProperty("items")
-    public void setItems(List<SubscriptionSpecCVCMItems> items) {
-        this.items = items;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("optional")
-    public Boolean getOptional() {
-        return optional;
-    }
-
-    @JsonProperty("optional")
-    public void setOptional(Boolean optional) {
-        this.optional = optional;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVConfigMapBuilder edit() {
-        return new SubscriptionSpecCVConfigMapBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVConfigMapBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVCsi.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVCsi.java
deleted file mode 100644
index 1f7b82c951f..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVCsi.java
+++ /dev/null
@@ -1,166 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "driver",
-    "fsType",
-    "nodePublishSecretRef",
-    "readOnly",
-    "volumeAttributes"
-})
-@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 SubscriptionSpecCVCsi implements Editable<SubscriptionSpecCVCsiBuilder> , KubernetesResource
-{
-
-    @JsonProperty("driver")
-    private String driver;
-    @JsonProperty("fsType")
-    private String fsType;
-    @JsonProperty("nodePublishSecretRef")
-    private SubscriptionSpecCVCNodePublishSecretRef nodePublishSecretRef;
-    @JsonProperty("readOnly")
-    private Boolean readOnly;
-    @JsonProperty("volumeAttributes")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, String> volumeAttributes = new LinkedHashMap<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVCsi() {
-    }
-
-    public SubscriptionSpecCVCsi(String driver, String fsType, SubscriptionSpecCVCNodePublishSecretRef nodePublishSecretRef, Boolean readOnly, Map<String, String> volumeAttributes) {
-        super();
-        this.driver = driver;
-        this.fsType = fsType;
-        this.nodePublishSecretRef = nodePublishSecretRef;
-        this.readOnly = readOnly;
-        this.volumeAttributes = volumeAttributes;
-    }
-
-    @JsonProperty("driver")
-    public String getDriver() {
-        return driver;
-    }
-
-    @JsonProperty("driver")
-    public void setDriver(String driver) {
-        this.driver = driver;
-    }
-
-    @JsonProperty("fsType")
-    public String getFsType() {
-        return fsType;
-    }
-
-    @JsonProperty("fsType")
-    public void setFsType(String fsType) {
-        this.fsType = fsType;
-    }
-
-    @JsonProperty("nodePublishSecretRef")
-    public SubscriptionSpecCVCNodePublishSecretRef getNodePublishSecretRef() {
-        return nodePublishSecretRef;
-    }
-
-    @JsonProperty("nodePublishSecretRef")
-    public void setNodePublishSecretRef(SubscriptionSpecCVCNodePublishSecretRef nodePublishSecretRef) {
-        this.nodePublishSecretRef = nodePublishSecretRef;
-    }
-
-    @JsonProperty("readOnly")
-    public Boolean getReadOnly() {
-        return readOnly;
-    }
-
-    @JsonProperty("readOnly")
-    public void setReadOnly(Boolean readOnly) {
-        this.readOnly = readOnly;
-    }
-
-    @JsonProperty("volumeAttributes")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, String> getVolumeAttributes() {
-        return volumeAttributes;
-    }
-
-    @JsonProperty("volumeAttributes")
-    public void setVolumeAttributes(Map<String, String> volumeAttributes) {
-        this.volumeAttributes = volumeAttributes;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVCsiBuilder edit() {
-        return new SubscriptionSpecCVCsiBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVCsiBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVDAIFieldRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVDAIFieldRef.java
deleted file mode 100644
index 8e5aba3c78a..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVDAIFieldRef.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "apiVersion",
-    "fieldPath"
-})
-@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 SubscriptionSpecCVDAIFieldRef implements Editable<SubscriptionSpecCVDAIFieldRefBuilder> , KubernetesResource
-{
-
-    @JsonProperty("apiVersion")
-    private String apiVersion;
-    @JsonProperty("fieldPath")
-    private String fieldPath;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVDAIFieldRef() {
-    }
-
-    public SubscriptionSpecCVDAIFieldRef(String apiVersion, String fieldPath) {
-        super();
-        this.apiVersion = apiVersion;
-        this.fieldPath = fieldPath;
-    }
-
-    @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;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVDAIFieldRefBuilder edit() {
-        return new SubscriptionSpecCVDAIFieldRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVDAIFieldRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVDAIResourceFieldRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVDAIResourceFieldRef.java
deleted file mode 100644
index 60d3d54b995..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVDAIResourceFieldRef.java
+++ /dev/null
@@ -1,138 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "containerName",
-    "divisor",
-    "resource"
-})
-@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 SubscriptionSpecCVDAIResourceFieldRef implements Editable<SubscriptionSpecCVDAIResourceFieldRefBuilder> , KubernetesResource
-{
-
-    @JsonProperty("containerName")
-    private String containerName;
-    @JsonProperty("divisor")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object divisor;
-    @JsonProperty("resource")
-    private String resource;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVDAIResourceFieldRef() {
-    }
-
-    public SubscriptionSpecCVDAIResourceFieldRef(String containerName, Object divisor, String resource) {
-        super();
-        this.containerName = containerName;
-        this.divisor = divisor;
-        this.resource = resource;
-    }
-
-    @JsonProperty("containerName")
-    public String getContainerName() {
-        return containerName;
-    }
-
-    @JsonProperty("containerName")
-    public void setContainerName(String containerName) {
-        this.containerName = containerName;
-    }
-
-    @JsonProperty("divisor")
-    public Object getDivisor() {
-        return divisor;
-    }
-
-    @JsonProperty("divisor")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setDivisor(Object divisor) {
-        this.divisor = divisor;
-    }
-
-    @JsonProperty("resource")
-    public String getResource() {
-        return resource;
-    }
-
-    @JsonProperty("resource")
-    public void setResource(String resource) {
-        this.resource = resource;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVDAIResourceFieldRefBuilder edit() {
-        return new SubscriptionSpecCVDAIResourceFieldRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVDAIResourceFieldRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVDAItems.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVDAItems.java
deleted file mode 100644
index 6dd1924624c..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVDAItems.java
+++ /dev/null
@@ -1,150 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "fieldRef",
-    "mode",
-    "path",
-    "resourceFieldRef"
-})
-@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 SubscriptionSpecCVDAItems implements Editable<SubscriptionSpecCVDAItemsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("fieldRef")
-    private SubscriptionSpecCVDAIFieldRef fieldRef;
-    @JsonProperty("mode")
-    private Integer mode;
-    @JsonProperty("path")
-    private String path;
-    @JsonProperty("resourceFieldRef")
-    private SubscriptionSpecCVDAIResourceFieldRef resourceFieldRef;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVDAItems() {
-    }
-
-    public SubscriptionSpecCVDAItems(SubscriptionSpecCVDAIFieldRef fieldRef, Integer mode, String path, SubscriptionSpecCVDAIResourceFieldRef resourceFieldRef) {
-        super();
-        this.fieldRef = fieldRef;
-        this.mode = mode;
-        this.path = path;
-        this.resourceFieldRef = resourceFieldRef;
-    }
-
-    @JsonProperty("fieldRef")
-    public SubscriptionSpecCVDAIFieldRef getFieldRef() {
-        return fieldRef;
-    }
-
-    @JsonProperty("fieldRef")
-    public void setFieldRef(SubscriptionSpecCVDAIFieldRef fieldRef) {
-        this.fieldRef = fieldRef;
-    }
-
-    @JsonProperty("mode")
-    public Integer getMode() {
-        return mode;
-    }
-
-    @JsonProperty("mode")
-    public void setMode(Integer mode) {
-        this.mode = mode;
-    }
-
-    @JsonProperty("path")
-    public String getPath() {
-        return path;
-    }
-
-    @JsonProperty("path")
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @JsonProperty("resourceFieldRef")
-    public SubscriptionSpecCVDAIResourceFieldRef getResourceFieldRef() {
-        return resourceFieldRef;
-    }
-
-    @JsonProperty("resourceFieldRef")
-    public void setResourceFieldRef(SubscriptionSpecCVDAIResourceFieldRef resourceFieldRef) {
-        this.resourceFieldRef = resourceFieldRef;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVDAItemsBuilder edit() {
-        return new SubscriptionSpecCVDAItemsBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVDAItemsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVDownwardAPI.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVDownwardAPI.java
deleted file mode 100644
index 61000665d8d..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVDownwardAPI.java
+++ /dev/null
@@ -1,126 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "defaultMode",
-    "items"
-})
-@ToString
-@EqualsAndHashCode
-@Accessors(prefix = {
-    "_",
-    ""
-})
-@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
-    @BuildableReference(ObjectMeta.class),
-    @BuildableReference(LabelSelector.class),
-    @BuildableReference(Container.class),
-    @BuildableReference(PodTemplateSpec.class),
-    @BuildableReference(ResourceRequirements.class),
-    @BuildableReference(IntOrString.class),
-    @BuildableReference(ObjectReference.class),
-    @BuildableReference(LocalObjectReference.class),
-    @BuildableReference(PersistentVolumeClaim.class)
-})
-@Generated("jsonschema2pojo")
-public class SubscriptionSpecCVDownwardAPI implements Editable<SubscriptionSpecCVDownwardAPIBuilder> , KubernetesResource
-{
-
-    @JsonProperty("defaultMode")
-    private Integer defaultMode;
-    @JsonProperty("items")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<SubscriptionSpecCVDAItems> items = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVDownwardAPI() {
-    }
-
-    public SubscriptionSpecCVDownwardAPI(Integer defaultMode, List<SubscriptionSpecCVDAItems> items) {
-        super();
-        this.defaultMode = defaultMode;
-        this.items = items;
-    }
-
-    @JsonProperty("defaultMode")
-    public Integer getDefaultMode() {
-        return defaultMode;
-    }
-
-    @JsonProperty("defaultMode")
-    public void setDefaultMode(Integer defaultMode) {
-        this.defaultMode = defaultMode;
-    }
-
-    @JsonProperty("items")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<SubscriptionSpecCVDAItems> getItems() {
-        return items;
-    }
-
-    @JsonProperty("items")
-    public void setItems(List<SubscriptionSpecCVDAItems> items) {
-        this.items = items;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVDownwardAPIBuilder edit() {
-        return new SubscriptionSpecCVDownwardAPIBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVDownwardAPIBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVEVCTSpec.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVEVCTSpec.java
deleted file mode 100644
index c4e5a93faf2..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVEVCTSpec.java
+++ /dev/null
@@ -1,224 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "accessModes",
-    "dataSource",
-    "dataSourceRef",
-    "resources",
-    "selector",
-    "storageClassName",
-    "volumeAttributesClassName",
-    "volumeMode",
-    "volumeName"
-})
-@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 SubscriptionSpecCVEVCTSpec implements Editable<SubscriptionSpecCVEVCTSpecBuilder> , KubernetesResource
-{
-
-    @JsonProperty("accessModes")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> accessModes = new ArrayList<>();
-    @JsonProperty("dataSource")
-    private SubscriptionSpecCVEVCTSpecDataSource dataSource;
-    @JsonProperty("dataSourceRef")
-    private SubscriptionSpecCVEVCTSpecDataSourceRef dataSourceRef;
-    @JsonProperty("resources")
-    private SubscriptionSpecCVEVCTSpecResources resources;
-    @JsonProperty("selector")
-    private SubscriptionSpecCVEVCTSpecSelector selector;
-    @JsonProperty("storageClassName")
-    private String storageClassName;
-    @JsonProperty("volumeAttributesClassName")
-    private String volumeAttributesClassName;
-    @JsonProperty("volumeMode")
-    private String volumeMode;
-    @JsonProperty("volumeName")
-    private String volumeName;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVEVCTSpec() {
-    }
-
-    public SubscriptionSpecCVEVCTSpec(List<String> accessModes, SubscriptionSpecCVEVCTSpecDataSource dataSource, SubscriptionSpecCVEVCTSpecDataSourceRef dataSourceRef, SubscriptionSpecCVEVCTSpecResources resources, SubscriptionSpecCVEVCTSpecSelector selector, String storageClassName, String volumeAttributesClassName, String volumeMode, String volumeName) {
-        super();
-        this.accessModes = accessModes;
-        this.dataSource = dataSource;
-        this.dataSourceRef = dataSourceRef;
-        this.resources = resources;
-        this.selector = selector;
-        this.storageClassName = storageClassName;
-        this.volumeAttributesClassName = volumeAttributesClassName;
-        this.volumeMode = volumeMode;
-        this.volumeName = volumeName;
-    }
-
-    @JsonProperty("accessModes")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getAccessModes() {
-        return accessModes;
-    }
-
-    @JsonProperty("accessModes")
-    public void setAccessModes(List<String> accessModes) {
-        this.accessModes = accessModes;
-    }
-
-    @JsonProperty("dataSource")
-    public SubscriptionSpecCVEVCTSpecDataSource getDataSource() {
-        return dataSource;
-    }
-
-    @JsonProperty("dataSource")
-    public void setDataSource(SubscriptionSpecCVEVCTSpecDataSource dataSource) {
-        this.dataSource = dataSource;
-    }
-
-    @JsonProperty("dataSourceRef")
-    public SubscriptionSpecCVEVCTSpecDataSourceRef getDataSourceRef() {
-        return dataSourceRef;
-    }
-
-    @JsonProperty("dataSourceRef")
-    public void setDataSourceRef(SubscriptionSpecCVEVCTSpecDataSourceRef dataSourceRef) {
-        this.dataSourceRef = dataSourceRef;
-    }
-
-    @JsonProperty("resources")
-    public SubscriptionSpecCVEVCTSpecResources getResources() {
-        return resources;
-    }
-
-    @JsonProperty("resources")
-    public void setResources(SubscriptionSpecCVEVCTSpecResources resources) {
-        this.resources = resources;
-    }
-
-    @JsonProperty("selector")
-    public SubscriptionSpecCVEVCTSpecSelector getSelector() {
-        return selector;
-    }
-
-    @JsonProperty("selector")
-    public void setSelector(SubscriptionSpecCVEVCTSpecSelector selector) {
-        this.selector = selector;
-    }
-
-    @JsonProperty("storageClassName")
-    public String getStorageClassName() {
-        return storageClassName;
-    }
-
-    @JsonProperty("storageClassName")
-    public void setStorageClassName(String storageClassName) {
-        this.storageClassName = storageClassName;
-    }
-
-    @JsonProperty("volumeAttributesClassName")
-    public String getVolumeAttributesClassName() {
-        return volumeAttributesClassName;
-    }
-
-    @JsonProperty("volumeAttributesClassName")
-    public void setVolumeAttributesClassName(String volumeAttributesClassName) {
-        this.volumeAttributesClassName = volumeAttributesClassName;
-    }
-
-    @JsonProperty("volumeMode")
-    public String getVolumeMode() {
-        return volumeMode;
-    }
-
-    @JsonProperty("volumeMode")
-    public void setVolumeMode(String volumeMode) {
-        this.volumeMode = volumeMode;
-    }
-
-    @JsonProperty("volumeName")
-    public String getVolumeName() {
-        return volumeName;
-    }
-
-    @JsonProperty("volumeName")
-    public void setVolumeName(String volumeName) {
-        this.volumeName = volumeName;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVEVCTSpecBuilder edit() {
-        return new SubscriptionSpecCVEVCTSpecBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVEVCTSpecBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVEVCTSpecDataSource.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVEVCTSpecDataSource.java
deleted file mode 100644
index 1518078791e..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVEVCTSpecDataSource.java
+++ /dev/null
@@ -1,136 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "kind",
-    "apiGroup",
-    "name"
-})
-@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 SubscriptionSpecCVEVCTSpecDataSource implements Editable<SubscriptionSpecCVEVCTSpecDataSourceBuilder> , KubernetesResource
-{
-
-    @JsonProperty("apiGroup")
-    private String apiGroup;
-    @JsonProperty("kind")
-    private String kind;
-    @JsonProperty("name")
-    private String name;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVEVCTSpecDataSource() {
-    }
-
-    public SubscriptionSpecCVEVCTSpecDataSource(String apiGroup, String kind, String name) {
-        super();
-        this.apiGroup = apiGroup;
-        this.kind = kind;
-        this.name = name;
-    }
-
-    @JsonProperty("apiGroup")
-    public String getApiGroup() {
-        return apiGroup;
-    }
-
-    @JsonProperty("apiGroup")
-    public void setApiGroup(String apiGroup) {
-        this.apiGroup = apiGroup;
-    }
-
-    @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;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVEVCTSpecDataSourceBuilder edit() {
-        return new SubscriptionSpecCVEVCTSpecDataSourceBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVEVCTSpecDataSourceBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVEVCTSpecDataSourceRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVEVCTSpecDataSourceRef.java
deleted file mode 100644
index 6fa5779b47e..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVEVCTSpecDataSourceRef.java
+++ /dev/null
@@ -1,150 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "kind",
-    "apiGroup",
-    "name",
-    "namespace"
-})
-@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 SubscriptionSpecCVEVCTSpecDataSourceRef implements Editable<SubscriptionSpecCVEVCTSpecDataSourceRefBuilder> , KubernetesResource
-{
-
-    @JsonProperty("apiGroup")
-    private String apiGroup;
-    @JsonProperty("kind")
-    private String kind;
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("namespace")
-    private String namespace;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVEVCTSpecDataSourceRef() {
-    }
-
-    public SubscriptionSpecCVEVCTSpecDataSourceRef(String apiGroup, String kind, String name, String namespace) {
-        super();
-        this.apiGroup = apiGroup;
-        this.kind = kind;
-        this.name = name;
-        this.namespace = namespace;
-    }
-
-    @JsonProperty("apiGroup")
-    public String getApiGroup() {
-        return apiGroup;
-    }
-
-    @JsonProperty("apiGroup")
-    public void setApiGroup(String apiGroup) {
-        this.apiGroup = apiGroup;
-    }
-
-    @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;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVEVCTSpecDataSourceRefBuilder edit() {
-        return new SubscriptionSpecCVEVCTSpecDataSourceRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVEVCTSpecDataSourceRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVEVCTSpecResources.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVEVCTSpecResources.java
deleted file mode 100644
index 9cbe9883f3f..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVEVCTSpecResources.java
+++ /dev/null
@@ -1,130 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "limits",
-    "requests"
-})
-@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 SubscriptionSpecCVEVCTSpecResources implements Editable<SubscriptionSpecCVEVCTSpecResourcesBuilder> , KubernetesResource
-{
-
-    @JsonProperty("limits")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializerForMap.class)
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, Object> limits = new LinkedHashMap<>();
-    @JsonProperty("requests")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializerForMap.class)
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, Object> requests = new LinkedHashMap<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVEVCTSpecResources() {
-    }
-
-    public SubscriptionSpecCVEVCTSpecResources(Map<String, Object> limits, Map<String, Object> requests) {
-        super();
-        this.limits = limits;
-        this.requests = requests;
-    }
-
-    @JsonProperty("limits")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, Object> getLimits() {
-        return limits;
-    }
-
-    @JsonProperty("limits")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializerForMap.class)
-    public void setLimits(Map<String, Object> limits) {
-        this.limits = limits;
-    }
-
-    @JsonProperty("requests")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, Object> getRequests() {
-        return requests;
-    }
-
-    @JsonProperty("requests")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializerForMap.class)
-    public void setRequests(Map<String, Object> requests) {
-        this.requests = requests;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVEVCTSpecResourcesBuilder edit() {
-        return new SubscriptionSpecCVEVCTSpecResourcesBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVEVCTSpecResourcesBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVEVCTSpecSMatchExpressions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVEVCTSpecSMatchExpressions.java
deleted file mode 100644
index 5d74de7277f..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVEVCTSpecSMatchExpressions.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "operator",
-    "values"
-})
-@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 SubscriptionSpecCVEVCTSpecSMatchExpressions implements Editable<SubscriptionSpecCVEVCTSpecSMatchExpressionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("operator")
-    private String operator;
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> values = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVEVCTSpecSMatchExpressions() {
-    }
-
-    public SubscriptionSpecCVEVCTSpecSMatchExpressions(String key, String operator, List<String> values) {
-        super();
-        this.key = key;
-        this.operator = operator;
-        this.values = values;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("operator")
-    public String getOperator() {
-        return operator;
-    }
-
-    @JsonProperty("operator")
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getValues() {
-        return values;
-    }
-
-    @JsonProperty("values")
-    public void setValues(List<String> values) {
-        this.values = values;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVEVCTSpecSMatchExpressionsBuilder edit() {
-        return new SubscriptionSpecCVEVCTSpecSMatchExpressionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVEVCTSpecSMatchExpressionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVEVCTSpecSelector.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVEVCTSpecSelector.java
deleted file mode 100644
index 54b7ac8011a..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVEVCTSpecSelector.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "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 SubscriptionSpecCVEVCTSpecSelector implements Editable<SubscriptionSpecCVEVCTSpecSelectorBuilder> , KubernetesResource
-{
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<SubscriptionSpecCVEVCTSpecSMatchExpressions> matchExpressions = new ArrayList<>();
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, String> matchLabels = new LinkedHashMap<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVEVCTSpecSelector() {
-    }
-
-    public SubscriptionSpecCVEVCTSpecSelector(List<SubscriptionSpecCVEVCTSpecSMatchExpressions> matchExpressions, Map<String, String> matchLabels) {
-        super();
-        this.matchExpressions = matchExpressions;
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<SubscriptionSpecCVEVCTSpecSMatchExpressions> getMatchExpressions() {
-        return matchExpressions;
-    }
-
-    @JsonProperty("matchExpressions")
-    public void setMatchExpressions(List<SubscriptionSpecCVEVCTSpecSMatchExpressions> matchExpressions) {
-        this.matchExpressions = matchExpressions;
-    }
-
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, String> getMatchLabels() {
-        return matchLabels;
-    }
-
-    @JsonProperty("matchLabels")
-    public void setMatchLabels(Map<String, String> matchLabels) {
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVEVCTSpecSelectorBuilder edit() {
-        return new SubscriptionSpecCVEVCTSpecSelectorBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVEVCTSpecSelectorBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVEVolumeClaimTemplate.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVEVolumeClaimTemplate.java
deleted file mode 100644
index 1d321c0f83d..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVEVolumeClaimTemplate.java
+++ /dev/null
@@ -1,124 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "metadata",
-    "spec"
-})
-@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 SubscriptionSpecCVEVolumeClaimTemplate implements Editable<SubscriptionSpecCVEVolumeClaimTemplateBuilder> , KubernetesResource
-{
-
-    @JsonProperty("metadata")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object metadata;
-    @JsonProperty("spec")
-    private SubscriptionSpecCVEVCTSpec spec;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVEVolumeClaimTemplate() {
-    }
-
-    public SubscriptionSpecCVEVolumeClaimTemplate(Object metadata, SubscriptionSpecCVEVCTSpec spec) {
-        super();
-        this.metadata = metadata;
-        this.spec = spec;
-    }
-
-    @JsonProperty("metadata")
-    public Object getMetadata() {
-        return metadata;
-    }
-
-    @JsonProperty("metadata")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setMetadata(Object metadata) {
-        this.metadata = metadata;
-    }
-
-    @JsonProperty("spec")
-    public SubscriptionSpecCVEVCTSpec getSpec() {
-        return spec;
-    }
-
-    @JsonProperty("spec")
-    public void setSpec(SubscriptionSpecCVEVCTSpec spec) {
-        this.spec = spec;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVEVolumeClaimTemplateBuilder edit() {
-        return new SubscriptionSpecCVEVolumeClaimTemplateBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVEVolumeClaimTemplateBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVEmptyDir.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVEmptyDir.java
deleted file mode 100644
index 2f14debc009..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVEmptyDir.java
+++ /dev/null
@@ -1,124 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "medium",
-    "sizeLimit"
-})
-@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 SubscriptionSpecCVEmptyDir implements Editable<SubscriptionSpecCVEmptyDirBuilder> , KubernetesResource
-{
-
-    @JsonProperty("medium")
-    private String medium;
-    @JsonProperty("sizeLimit")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object sizeLimit;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVEmptyDir() {
-    }
-
-    public SubscriptionSpecCVEmptyDir(String medium, Object sizeLimit) {
-        super();
-        this.medium = medium;
-        this.sizeLimit = sizeLimit;
-    }
-
-    @JsonProperty("medium")
-    public String getMedium() {
-        return medium;
-    }
-
-    @JsonProperty("medium")
-    public void setMedium(String medium) {
-        this.medium = medium;
-    }
-
-    @JsonProperty("sizeLimit")
-    public Object getSizeLimit() {
-        return sizeLimit;
-    }
-
-    @JsonProperty("sizeLimit")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setSizeLimit(Object sizeLimit) {
-        this.sizeLimit = sizeLimit;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVEmptyDirBuilder edit() {
-        return new SubscriptionSpecCVEmptyDirBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVEmptyDirBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVEphemeral.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVEphemeral.java
deleted file mode 100644
index 6f1220738c1..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVEphemeral.java
+++ /dev/null
@@ -1,108 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "volumeClaimTemplate"
-})
-@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 SubscriptionSpecCVEphemeral implements Editable<SubscriptionSpecCVEphemeralBuilder> , KubernetesResource
-{
-
-    @JsonProperty("volumeClaimTemplate")
-    private SubscriptionSpecCVEVolumeClaimTemplate volumeClaimTemplate;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVEphemeral() {
-    }
-
-    public SubscriptionSpecCVEphemeral(SubscriptionSpecCVEVolumeClaimTemplate volumeClaimTemplate) {
-        super();
-        this.volumeClaimTemplate = volumeClaimTemplate;
-    }
-
-    @JsonProperty("volumeClaimTemplate")
-    public SubscriptionSpecCVEVolumeClaimTemplate getVolumeClaimTemplate() {
-        return volumeClaimTemplate;
-    }
-
-    @JsonProperty("volumeClaimTemplate")
-    public void setVolumeClaimTemplate(SubscriptionSpecCVEVolumeClaimTemplate volumeClaimTemplate) {
-        this.volumeClaimTemplate = volumeClaimTemplate;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVEphemeralBuilder edit() {
-        return new SubscriptionSpecCVEphemeralBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVEphemeralBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVFVSecretRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVFVSecretRef.java
deleted file mode 100644
index bc83c14c438..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVFVSecretRef.java
+++ /dev/null
@@ -1,108 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name"
-})
-@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 SubscriptionSpecCVFVSecretRef implements Editable<SubscriptionSpecCVFVSecretRefBuilder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVFVSecretRef() {
-    }
-
-    public SubscriptionSpecCVFVSecretRef(String name) {
-        super();
-        this.name = name;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVFVSecretRefBuilder edit() {
-        return new SubscriptionSpecCVFVSecretRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVFVSecretRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVFc.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVFc.java
deleted file mode 100644
index f81a431732c..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVFc.java
+++ /dev/null
@@ -1,170 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "fsType",
-    "lun",
-    "readOnly",
-    "targetWWNs",
-    "wwids"
-})
-@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 SubscriptionSpecCVFc implements Editable<SubscriptionSpecCVFcBuilder> , KubernetesResource
-{
-
-    @JsonProperty("fsType")
-    private String fsType;
-    @JsonProperty("lun")
-    private Integer lun;
-    @JsonProperty("readOnly")
-    private Boolean readOnly;
-    @JsonProperty("targetWWNs")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> targetWWNs = new ArrayList<>();
-    @JsonProperty("wwids")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> wwids = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVFc() {
-    }
-
-    public SubscriptionSpecCVFc(String fsType, Integer lun, Boolean readOnly, List<String> targetWWNs, List<String> wwids) {
-        super();
-        this.fsType = fsType;
-        this.lun = lun;
-        this.readOnly = readOnly;
-        this.targetWWNs = targetWWNs;
-        this.wwids = wwids;
-    }
-
-    @JsonProperty("fsType")
-    public String getFsType() {
-        return fsType;
-    }
-
-    @JsonProperty("fsType")
-    public void setFsType(String fsType) {
-        this.fsType = fsType;
-    }
-
-    @JsonProperty("lun")
-    public Integer getLun() {
-        return lun;
-    }
-
-    @JsonProperty("lun")
-    public void setLun(Integer lun) {
-        this.lun = lun;
-    }
-
-    @JsonProperty("readOnly")
-    public Boolean getReadOnly() {
-        return readOnly;
-    }
-
-    @JsonProperty("readOnly")
-    public void setReadOnly(Boolean readOnly) {
-        this.readOnly = readOnly;
-    }
-
-    @JsonProperty("targetWWNs")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getTargetWWNs() {
-        return targetWWNs;
-    }
-
-    @JsonProperty("targetWWNs")
-    public void setTargetWWNs(List<String> targetWWNs) {
-        this.targetWWNs = targetWWNs;
-    }
-
-    @JsonProperty("wwids")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getWwids() {
-        return wwids;
-    }
-
-    @JsonProperty("wwids")
-    public void setWwids(List<String> wwids) {
-        this.wwids = wwids;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVFcBuilder edit() {
-        return new SubscriptionSpecCVFcBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVFcBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVFlexVolume.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVFlexVolume.java
deleted file mode 100644
index b9aa02f7791..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVFlexVolume.java
+++ /dev/null
@@ -1,166 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "driver",
-    "fsType",
-    "options",
-    "readOnly",
-    "secretRef"
-})
-@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 SubscriptionSpecCVFlexVolume implements Editable<SubscriptionSpecCVFlexVolumeBuilder> , KubernetesResource
-{
-
-    @JsonProperty("driver")
-    private String driver;
-    @JsonProperty("fsType")
-    private String fsType;
-    @JsonProperty("options")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, String> options = new LinkedHashMap<>();
-    @JsonProperty("readOnly")
-    private Boolean readOnly;
-    @JsonProperty("secretRef")
-    private SubscriptionSpecCVFVSecretRef secretRef;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVFlexVolume() {
-    }
-
-    public SubscriptionSpecCVFlexVolume(String driver, String fsType, Map<String, String> options, Boolean readOnly, SubscriptionSpecCVFVSecretRef secretRef) {
-        super();
-        this.driver = driver;
-        this.fsType = fsType;
-        this.options = options;
-        this.readOnly = readOnly;
-        this.secretRef = secretRef;
-    }
-
-    @JsonProperty("driver")
-    public String getDriver() {
-        return driver;
-    }
-
-    @JsonProperty("driver")
-    public void setDriver(String driver) {
-        this.driver = driver;
-    }
-
-    @JsonProperty("fsType")
-    public String getFsType() {
-        return fsType;
-    }
-
-    @JsonProperty("fsType")
-    public void setFsType(String fsType) {
-        this.fsType = fsType;
-    }
-
-    @JsonProperty("options")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, String> getOptions() {
-        return options;
-    }
-
-    @JsonProperty("options")
-    public void setOptions(Map<String, String> options) {
-        this.options = options;
-    }
-
-    @JsonProperty("readOnly")
-    public Boolean getReadOnly() {
-        return readOnly;
-    }
-
-    @JsonProperty("readOnly")
-    public void setReadOnly(Boolean readOnly) {
-        this.readOnly = readOnly;
-    }
-
-    @JsonProperty("secretRef")
-    public SubscriptionSpecCVFVSecretRef getSecretRef() {
-        return secretRef;
-    }
-
-    @JsonProperty("secretRef")
-    public void setSecretRef(SubscriptionSpecCVFVSecretRef secretRef) {
-        this.secretRef = secretRef;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVFlexVolumeBuilder edit() {
-        return new SubscriptionSpecCVFlexVolumeBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVFlexVolumeBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVFlocker.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVFlocker.java
deleted file mode 100644
index 993d3db6b45..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVFlocker.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "datasetName",
-    "datasetUUID"
-})
-@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 SubscriptionSpecCVFlocker implements Editable<SubscriptionSpecCVFlockerBuilder> , KubernetesResource
-{
-
-    @JsonProperty("datasetName")
-    private String datasetName;
-    @JsonProperty("datasetUUID")
-    private String datasetUUID;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVFlocker() {
-    }
-
-    public SubscriptionSpecCVFlocker(String datasetName, String datasetUUID) {
-        super();
-        this.datasetName = datasetName;
-        this.datasetUUID = datasetUUID;
-    }
-
-    @JsonProperty("datasetName")
-    public String getDatasetName() {
-        return datasetName;
-    }
-
-    @JsonProperty("datasetName")
-    public void setDatasetName(String datasetName) {
-        this.datasetName = datasetName;
-    }
-
-    @JsonProperty("datasetUUID")
-    public String getDatasetUUID() {
-        return datasetUUID;
-    }
-
-    @JsonProperty("datasetUUID")
-    public void setDatasetUUID(String datasetUUID) {
-        this.datasetUUID = datasetUUID;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVFlockerBuilder edit() {
-        return new SubscriptionSpecCVFlockerBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVFlockerBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVGcePersistentDisk.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVGcePersistentDisk.java
deleted file mode 100644
index db898f1f2d6..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVGcePersistentDisk.java
+++ /dev/null
@@ -1,150 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "fsType",
-    "partition",
-    "pdName",
-    "readOnly"
-})
-@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 SubscriptionSpecCVGcePersistentDisk implements Editable<SubscriptionSpecCVGcePersistentDiskBuilder> , KubernetesResource
-{
-
-    @JsonProperty("fsType")
-    private String fsType;
-    @JsonProperty("partition")
-    private Integer partition;
-    @JsonProperty("pdName")
-    private String pdName;
-    @JsonProperty("readOnly")
-    private Boolean readOnly;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVGcePersistentDisk() {
-    }
-
-    public SubscriptionSpecCVGcePersistentDisk(String fsType, Integer partition, String pdName, Boolean readOnly) {
-        super();
-        this.fsType = fsType;
-        this.partition = partition;
-        this.pdName = pdName;
-        this.readOnly = readOnly;
-    }
-
-    @JsonProperty("fsType")
-    public String getFsType() {
-        return fsType;
-    }
-
-    @JsonProperty("fsType")
-    public void setFsType(String fsType) {
-        this.fsType = fsType;
-    }
-
-    @JsonProperty("partition")
-    public Integer getPartition() {
-        return partition;
-    }
-
-    @JsonProperty("partition")
-    public void setPartition(Integer partition) {
-        this.partition = partition;
-    }
-
-    @JsonProperty("pdName")
-    public String getPdName() {
-        return pdName;
-    }
-
-    @JsonProperty("pdName")
-    public void setPdName(String pdName) {
-        this.pdName = pdName;
-    }
-
-    @JsonProperty("readOnly")
-    public Boolean getReadOnly() {
-        return readOnly;
-    }
-
-    @JsonProperty("readOnly")
-    public void setReadOnly(Boolean readOnly) {
-        this.readOnly = readOnly;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVGcePersistentDiskBuilder edit() {
-        return new SubscriptionSpecCVGcePersistentDiskBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVGcePersistentDiskBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVGitRepo.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVGitRepo.java
deleted file mode 100644
index f407fc5d9dd..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVGitRepo.java
+++ /dev/null
@@ -1,136 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "directory",
-    "repository",
-    "revision"
-})
-@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 SubscriptionSpecCVGitRepo implements Editable<SubscriptionSpecCVGitRepoBuilder> , KubernetesResource
-{
-
-    @JsonProperty("directory")
-    private String directory;
-    @JsonProperty("repository")
-    private String repository;
-    @JsonProperty("revision")
-    private String revision;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVGitRepo() {
-    }
-
-    public SubscriptionSpecCVGitRepo(String directory, String repository, String revision) {
-        super();
-        this.directory = directory;
-        this.repository = repository;
-        this.revision = revision;
-    }
-
-    @JsonProperty("directory")
-    public String getDirectory() {
-        return directory;
-    }
-
-    @JsonProperty("directory")
-    public void setDirectory(String directory) {
-        this.directory = directory;
-    }
-
-    @JsonProperty("repository")
-    public String getRepository() {
-        return repository;
-    }
-
-    @JsonProperty("repository")
-    public void setRepository(String repository) {
-        this.repository = repository;
-    }
-
-    @JsonProperty("revision")
-    public String getRevision() {
-        return revision;
-    }
-
-    @JsonProperty("revision")
-    public void setRevision(String revision) {
-        this.revision = revision;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVGitRepoBuilder edit() {
-        return new SubscriptionSpecCVGitRepoBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVGitRepoBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVGlusterfs.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVGlusterfs.java
deleted file mode 100644
index a62563b5747..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVGlusterfs.java
+++ /dev/null
@@ -1,136 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "endpoints",
-    "path",
-    "readOnly"
-})
-@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 SubscriptionSpecCVGlusterfs implements Editable<SubscriptionSpecCVGlusterfsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("endpoints")
-    private String endpoints;
-    @JsonProperty("path")
-    private String path;
-    @JsonProperty("readOnly")
-    private Boolean readOnly;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVGlusterfs() {
-    }
-
-    public SubscriptionSpecCVGlusterfs(String endpoints, String path, Boolean readOnly) {
-        super();
-        this.endpoints = endpoints;
-        this.path = path;
-        this.readOnly = readOnly;
-    }
-
-    @JsonProperty("endpoints")
-    public String getEndpoints() {
-        return endpoints;
-    }
-
-    @JsonProperty("endpoints")
-    public void setEndpoints(String endpoints) {
-        this.endpoints = endpoints;
-    }
-
-    @JsonProperty("path")
-    public String getPath() {
-        return path;
-    }
-
-    @JsonProperty("path")
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @JsonProperty("readOnly")
-    public Boolean getReadOnly() {
-        return readOnly;
-    }
-
-    @JsonProperty("readOnly")
-    public void setReadOnly(Boolean readOnly) {
-        this.readOnly = readOnly;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVGlusterfsBuilder edit() {
-        return new SubscriptionSpecCVGlusterfsBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVGlusterfsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVHostPath.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVHostPath.java
deleted file mode 100644
index 168e2d60b36..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVHostPath.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "path",
-    "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 SubscriptionSpecCVHostPath implements Editable<SubscriptionSpecCVHostPathBuilder> , KubernetesResource
-{
-
-    @JsonProperty("path")
-    private String path;
-    @JsonProperty("type")
-    private String type;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVHostPath() {
-    }
-
-    public SubscriptionSpecCVHostPath(String path, String type) {
-        super();
-        this.path = path;
-        this.type = type;
-    }
-
-    @JsonProperty("path")
-    public String getPath() {
-        return path;
-    }
-
-    @JsonProperty("path")
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @JsonProperty("type")
-    public String getType() {
-        return type;
-    }
-
-    @JsonProperty("type")
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVHostPathBuilder edit() {
-        return new SubscriptionSpecCVHostPathBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVHostPathBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVISecretRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVISecretRef.java
deleted file mode 100644
index a3e3ec73f92..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVISecretRef.java
+++ /dev/null
@@ -1,108 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name"
-})
-@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 SubscriptionSpecCVISecretRef implements Editable<SubscriptionSpecCVISecretRefBuilder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVISecretRef() {
-    }
-
-    public SubscriptionSpecCVISecretRef(String name) {
-        super();
-        this.name = name;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVISecretRefBuilder edit() {
-        return new SubscriptionSpecCVISecretRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVISecretRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVIscsi.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVIscsi.java
deleted file mode 100644
index 82778dfa51d..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVIscsi.java
+++ /dev/null
@@ -1,252 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "chapAuthDiscovery",
-    "chapAuthSession",
-    "fsType",
-    "initiatorName",
-    "iqn",
-    "iscsiInterface",
-    "lun",
-    "portals",
-    "readOnly",
-    "secretRef",
-    "targetPortal"
-})
-@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 SubscriptionSpecCVIscsi implements Editable<SubscriptionSpecCVIscsiBuilder> , KubernetesResource
-{
-
-    @JsonProperty("chapAuthDiscovery")
-    private Boolean chapAuthDiscovery;
-    @JsonProperty("chapAuthSession")
-    private Boolean chapAuthSession;
-    @JsonProperty("fsType")
-    private String fsType;
-    @JsonProperty("initiatorName")
-    private String initiatorName;
-    @JsonProperty("iqn")
-    private String iqn;
-    @JsonProperty("iscsiInterface")
-    private String iscsiInterface;
-    @JsonProperty("lun")
-    private Integer lun;
-    @JsonProperty("portals")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> portals = new ArrayList<>();
-    @JsonProperty("readOnly")
-    private Boolean readOnly;
-    @JsonProperty("secretRef")
-    private SubscriptionSpecCVISecretRef secretRef;
-    @JsonProperty("targetPortal")
-    private String targetPortal;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVIscsi() {
-    }
-
-    public SubscriptionSpecCVIscsi(Boolean chapAuthDiscovery, Boolean chapAuthSession, String fsType, String initiatorName, String iqn, String iscsiInterface, Integer lun, List<String> portals, Boolean readOnly, SubscriptionSpecCVISecretRef secretRef, String targetPortal) {
-        super();
-        this.chapAuthDiscovery = chapAuthDiscovery;
-        this.chapAuthSession = chapAuthSession;
-        this.fsType = fsType;
-        this.initiatorName = initiatorName;
-        this.iqn = iqn;
-        this.iscsiInterface = iscsiInterface;
-        this.lun = lun;
-        this.portals = portals;
-        this.readOnly = readOnly;
-        this.secretRef = secretRef;
-        this.targetPortal = targetPortal;
-    }
-
-    @JsonProperty("chapAuthDiscovery")
-    public Boolean getChapAuthDiscovery() {
-        return chapAuthDiscovery;
-    }
-
-    @JsonProperty("chapAuthDiscovery")
-    public void setChapAuthDiscovery(Boolean chapAuthDiscovery) {
-        this.chapAuthDiscovery = chapAuthDiscovery;
-    }
-
-    @JsonProperty("chapAuthSession")
-    public Boolean getChapAuthSession() {
-        return chapAuthSession;
-    }
-
-    @JsonProperty("chapAuthSession")
-    public void setChapAuthSession(Boolean chapAuthSession) {
-        this.chapAuthSession = chapAuthSession;
-    }
-
-    @JsonProperty("fsType")
-    public String getFsType() {
-        return fsType;
-    }
-
-    @JsonProperty("fsType")
-    public void setFsType(String fsType) {
-        this.fsType = fsType;
-    }
-
-    @JsonProperty("initiatorName")
-    public String getInitiatorName() {
-        return initiatorName;
-    }
-
-    @JsonProperty("initiatorName")
-    public void setInitiatorName(String initiatorName) {
-        this.initiatorName = initiatorName;
-    }
-
-    @JsonProperty("iqn")
-    public String getIqn() {
-        return iqn;
-    }
-
-    @JsonProperty("iqn")
-    public void setIqn(String iqn) {
-        this.iqn = iqn;
-    }
-
-    @JsonProperty("iscsiInterface")
-    public String getIscsiInterface() {
-        return iscsiInterface;
-    }
-
-    @JsonProperty("iscsiInterface")
-    public void setIscsiInterface(String iscsiInterface) {
-        this.iscsiInterface = iscsiInterface;
-    }
-
-    @JsonProperty("lun")
-    public Integer getLun() {
-        return lun;
-    }
-
-    @JsonProperty("lun")
-    public void setLun(Integer lun) {
-        this.lun = lun;
-    }
-
-    @JsonProperty("portals")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getPortals() {
-        return portals;
-    }
-
-    @JsonProperty("portals")
-    public void setPortals(List<String> portals) {
-        this.portals = portals;
-    }
-
-    @JsonProperty("readOnly")
-    public Boolean getReadOnly() {
-        return readOnly;
-    }
-
-    @JsonProperty("readOnly")
-    public void setReadOnly(Boolean readOnly) {
-        this.readOnly = readOnly;
-    }
-
-    @JsonProperty("secretRef")
-    public SubscriptionSpecCVISecretRef getSecretRef() {
-        return secretRef;
-    }
-
-    @JsonProperty("secretRef")
-    public void setSecretRef(SubscriptionSpecCVISecretRef secretRef) {
-        this.secretRef = secretRef;
-    }
-
-    @JsonProperty("targetPortal")
-    public String getTargetPortal() {
-        return targetPortal;
-    }
-
-    @JsonProperty("targetPortal")
-    public void setTargetPortal(String targetPortal) {
-        this.targetPortal = targetPortal;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVIscsiBuilder edit() {
-        return new SubscriptionSpecCVIscsiBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVIscsiBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVNfs.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVNfs.java
deleted file mode 100644
index b91a34ee443..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVNfs.java
+++ /dev/null
@@ -1,136 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "path",
-    "readOnly",
-    "server"
-})
-@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 SubscriptionSpecCVNfs implements Editable<SubscriptionSpecCVNfsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("path")
-    private String path;
-    @JsonProperty("readOnly")
-    private Boolean readOnly;
-    @JsonProperty("server")
-    private String server;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVNfs() {
-    }
-
-    public SubscriptionSpecCVNfs(String path, Boolean readOnly, String server) {
-        super();
-        this.path = path;
-        this.readOnly = readOnly;
-        this.server = server;
-    }
-
-    @JsonProperty("path")
-    public String getPath() {
-        return path;
-    }
-
-    @JsonProperty("path")
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @JsonProperty("readOnly")
-    public Boolean getReadOnly() {
-        return readOnly;
-    }
-
-    @JsonProperty("readOnly")
-    public void setReadOnly(Boolean readOnly) {
-        this.readOnly = readOnly;
-    }
-
-    @JsonProperty("server")
-    public String getServer() {
-        return server;
-    }
-
-    @JsonProperty("server")
-    public void setServer(String server) {
-        this.server = server;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVNfsBuilder edit() {
-        return new SubscriptionSpecCVNfsBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVNfsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVPSCMItems.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVPSCMItems.java
deleted file mode 100644
index f0ed3767ed6..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVPSCMItems.java
+++ /dev/null
@@ -1,136 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "mode",
-    "path"
-})
-@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 SubscriptionSpecCVPSCMItems implements Editable<SubscriptionSpecCVPSCMItemsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("mode")
-    private Integer mode;
-    @JsonProperty("path")
-    private String path;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVPSCMItems() {
-    }
-
-    public SubscriptionSpecCVPSCMItems(String key, Integer mode, String path) {
-        super();
-        this.key = key;
-        this.mode = mode;
-        this.path = path;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("mode")
-    public Integer getMode() {
-        return mode;
-    }
-
-    @JsonProperty("mode")
-    public void setMode(Integer mode) {
-        this.mode = mode;
-    }
-
-    @JsonProperty("path")
-    public String getPath() {
-        return path;
-    }
-
-    @JsonProperty("path")
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVPSCMItemsBuilder edit() {
-        return new SubscriptionSpecCVPSCMItemsBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVPSCMItemsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVPSCTBLSMatchExpressions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVPSCTBLSMatchExpressions.java
deleted file mode 100644
index 7b19bca5c0f..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVPSCTBLSMatchExpressions.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "operator",
-    "values"
-})
-@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 SubscriptionSpecCVPSCTBLSMatchExpressions implements Editable<SubscriptionSpecCVPSCTBLSMatchExpressionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("operator")
-    private String operator;
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> values = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVPSCTBLSMatchExpressions() {
-    }
-
-    public SubscriptionSpecCVPSCTBLSMatchExpressions(String key, String operator, List<String> values) {
-        super();
-        this.key = key;
-        this.operator = operator;
-        this.values = values;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("operator")
-    public String getOperator() {
-        return operator;
-    }
-
-    @JsonProperty("operator")
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getValues() {
-        return values;
-    }
-
-    @JsonProperty("values")
-    public void setValues(List<String> values) {
-        this.values = values;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVPSCTBLSMatchExpressionsBuilder edit() {
-        return new SubscriptionSpecCVPSCTBLSMatchExpressionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVPSCTBLSMatchExpressionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVPSCTBLabelSelector.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVPSCTBLabelSelector.java
deleted file mode 100644
index 396ed6354a4..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVPSCTBLabelSelector.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "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 SubscriptionSpecCVPSCTBLabelSelector implements Editable<SubscriptionSpecCVPSCTBLabelSelectorBuilder> , KubernetesResource
-{
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<SubscriptionSpecCVPSCTBLSMatchExpressions> matchExpressions = new ArrayList<>();
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, String> matchLabels = new LinkedHashMap<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVPSCTBLabelSelector() {
-    }
-
-    public SubscriptionSpecCVPSCTBLabelSelector(List<SubscriptionSpecCVPSCTBLSMatchExpressions> matchExpressions, Map<String, String> matchLabels) {
-        super();
-        this.matchExpressions = matchExpressions;
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<SubscriptionSpecCVPSCTBLSMatchExpressions> getMatchExpressions() {
-        return matchExpressions;
-    }
-
-    @JsonProperty("matchExpressions")
-    public void setMatchExpressions(List<SubscriptionSpecCVPSCTBLSMatchExpressions> matchExpressions) {
-        this.matchExpressions = matchExpressions;
-    }
-
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, String> getMatchLabels() {
-        return matchLabels;
-    }
-
-    @JsonProperty("matchLabels")
-    public void setMatchLabels(Map<String, String> matchLabels) {
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVPSCTBLabelSelectorBuilder edit() {
-        return new SubscriptionSpecCVPSCTBLabelSelectorBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVPSCTBLabelSelectorBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVPSClusterTrustBundle.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVPSClusterTrustBundle.java
deleted file mode 100644
index 16c61539cc8..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVPSClusterTrustBundle.java
+++ /dev/null
@@ -1,164 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "labelSelector",
-    "name",
-    "optional",
-    "path",
-    "signerName"
-})
-@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 SubscriptionSpecCVPSClusterTrustBundle implements Editable<SubscriptionSpecCVPSClusterTrustBundleBuilder> , KubernetesResource
-{
-
-    @JsonProperty("labelSelector")
-    private SubscriptionSpecCVPSCTBLabelSelector labelSelector;
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("optional")
-    private Boolean optional;
-    @JsonProperty("path")
-    private String path;
-    @JsonProperty("signerName")
-    private String signerName;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVPSClusterTrustBundle() {
-    }
-
-    public SubscriptionSpecCVPSClusterTrustBundle(SubscriptionSpecCVPSCTBLabelSelector labelSelector, String name, Boolean optional, String path, String signerName) {
-        super();
-        this.labelSelector = labelSelector;
-        this.name = name;
-        this.optional = optional;
-        this.path = path;
-        this.signerName = signerName;
-    }
-
-    @JsonProperty("labelSelector")
-    public SubscriptionSpecCVPSCTBLabelSelector getLabelSelector() {
-        return labelSelector;
-    }
-
-    @JsonProperty("labelSelector")
-    public void setLabelSelector(SubscriptionSpecCVPSCTBLabelSelector labelSelector) {
-        this.labelSelector = labelSelector;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("optional")
-    public Boolean getOptional() {
-        return optional;
-    }
-
-    @JsonProperty("optional")
-    public void setOptional(Boolean optional) {
-        this.optional = optional;
-    }
-
-    @JsonProperty("path")
-    public String getPath() {
-        return path;
-    }
-
-    @JsonProperty("path")
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @JsonProperty("signerName")
-    public String getSignerName() {
-        return signerName;
-    }
-
-    @JsonProperty("signerName")
-    public void setSignerName(String signerName) {
-        this.signerName = signerName;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVPSClusterTrustBundleBuilder edit() {
-        return new SubscriptionSpecCVPSClusterTrustBundleBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVPSClusterTrustBundleBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVPSConfigMap.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVPSConfigMap.java
deleted file mode 100644
index 966bfa479aa..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVPSConfigMap.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "items",
-    "name",
-    "optional"
-})
-@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 SubscriptionSpecCVPSConfigMap implements Editable<SubscriptionSpecCVPSConfigMapBuilder> , KubernetesResource
-{
-
-    @JsonProperty("items")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<SubscriptionSpecCVPSCMItems> items = new ArrayList<>();
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("optional")
-    private Boolean optional;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVPSConfigMap() {
-    }
-
-    public SubscriptionSpecCVPSConfigMap(List<SubscriptionSpecCVPSCMItems> items, String name, Boolean optional) {
-        super();
-        this.items = items;
-        this.name = name;
-        this.optional = optional;
-    }
-
-    @JsonProperty("items")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<SubscriptionSpecCVPSCMItems> getItems() {
-        return items;
-    }
-
-    @JsonProperty("items")
-    public void setItems(List<SubscriptionSpecCVPSCMItems> items) {
-        this.items = items;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("optional")
-    public Boolean getOptional() {
-        return optional;
-    }
-
-    @JsonProperty("optional")
-    public void setOptional(Boolean optional) {
-        this.optional = optional;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVPSConfigMapBuilder edit() {
-        return new SubscriptionSpecCVPSConfigMapBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVPSConfigMapBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVPSDAIFieldRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVPSDAIFieldRef.java
deleted file mode 100644
index ff1e6681b4d..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVPSDAIFieldRef.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "apiVersion",
-    "fieldPath"
-})
-@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 SubscriptionSpecCVPSDAIFieldRef implements Editable<SubscriptionSpecCVPSDAIFieldRefBuilder> , KubernetesResource
-{
-
-    @JsonProperty("apiVersion")
-    private String apiVersion;
-    @JsonProperty("fieldPath")
-    private String fieldPath;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVPSDAIFieldRef() {
-    }
-
-    public SubscriptionSpecCVPSDAIFieldRef(String apiVersion, String fieldPath) {
-        super();
-        this.apiVersion = apiVersion;
-        this.fieldPath = fieldPath;
-    }
-
-    @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;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVPSDAIFieldRefBuilder edit() {
-        return new SubscriptionSpecCVPSDAIFieldRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVPSDAIFieldRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVPSDAIResourceFieldRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVPSDAIResourceFieldRef.java
deleted file mode 100644
index 1f26b170a7e..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVPSDAIResourceFieldRef.java
+++ /dev/null
@@ -1,138 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "containerName",
-    "divisor",
-    "resource"
-})
-@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 SubscriptionSpecCVPSDAIResourceFieldRef implements Editable<SubscriptionSpecCVPSDAIResourceFieldRefBuilder> , KubernetesResource
-{
-
-    @JsonProperty("containerName")
-    private String containerName;
-    @JsonProperty("divisor")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object divisor;
-    @JsonProperty("resource")
-    private String resource;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVPSDAIResourceFieldRef() {
-    }
-
-    public SubscriptionSpecCVPSDAIResourceFieldRef(String containerName, Object divisor, String resource) {
-        super();
-        this.containerName = containerName;
-        this.divisor = divisor;
-        this.resource = resource;
-    }
-
-    @JsonProperty("containerName")
-    public String getContainerName() {
-        return containerName;
-    }
-
-    @JsonProperty("containerName")
-    public void setContainerName(String containerName) {
-        this.containerName = containerName;
-    }
-
-    @JsonProperty("divisor")
-    public Object getDivisor() {
-        return divisor;
-    }
-
-    @JsonProperty("divisor")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setDivisor(Object divisor) {
-        this.divisor = divisor;
-    }
-
-    @JsonProperty("resource")
-    public String getResource() {
-        return resource;
-    }
-
-    @JsonProperty("resource")
-    public void setResource(String resource) {
-        this.resource = resource;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVPSDAIResourceFieldRefBuilder edit() {
-        return new SubscriptionSpecCVPSDAIResourceFieldRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVPSDAIResourceFieldRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVPSDAItems.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVPSDAItems.java
deleted file mode 100644
index 080d5dc8ed2..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVPSDAItems.java
+++ /dev/null
@@ -1,150 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "fieldRef",
-    "mode",
-    "path",
-    "resourceFieldRef"
-})
-@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 SubscriptionSpecCVPSDAItems implements Editable<SubscriptionSpecCVPSDAItemsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("fieldRef")
-    private SubscriptionSpecCVPSDAIFieldRef fieldRef;
-    @JsonProperty("mode")
-    private Integer mode;
-    @JsonProperty("path")
-    private String path;
-    @JsonProperty("resourceFieldRef")
-    private SubscriptionSpecCVPSDAIResourceFieldRef resourceFieldRef;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVPSDAItems() {
-    }
-
-    public SubscriptionSpecCVPSDAItems(SubscriptionSpecCVPSDAIFieldRef fieldRef, Integer mode, String path, SubscriptionSpecCVPSDAIResourceFieldRef resourceFieldRef) {
-        super();
-        this.fieldRef = fieldRef;
-        this.mode = mode;
-        this.path = path;
-        this.resourceFieldRef = resourceFieldRef;
-    }
-
-    @JsonProperty("fieldRef")
-    public SubscriptionSpecCVPSDAIFieldRef getFieldRef() {
-        return fieldRef;
-    }
-
-    @JsonProperty("fieldRef")
-    public void setFieldRef(SubscriptionSpecCVPSDAIFieldRef fieldRef) {
-        this.fieldRef = fieldRef;
-    }
-
-    @JsonProperty("mode")
-    public Integer getMode() {
-        return mode;
-    }
-
-    @JsonProperty("mode")
-    public void setMode(Integer mode) {
-        this.mode = mode;
-    }
-
-    @JsonProperty("path")
-    public String getPath() {
-        return path;
-    }
-
-    @JsonProperty("path")
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @JsonProperty("resourceFieldRef")
-    public SubscriptionSpecCVPSDAIResourceFieldRef getResourceFieldRef() {
-        return resourceFieldRef;
-    }
-
-    @JsonProperty("resourceFieldRef")
-    public void setResourceFieldRef(SubscriptionSpecCVPSDAIResourceFieldRef resourceFieldRef) {
-        this.resourceFieldRef = resourceFieldRef;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVPSDAItemsBuilder edit() {
-        return new SubscriptionSpecCVPSDAItemsBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVPSDAItemsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVPSDownwardAPI.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVPSDownwardAPI.java
deleted file mode 100644
index 7be399a79dd..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVPSDownwardAPI.java
+++ /dev/null
@@ -1,112 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "items"
-})
-@ToString
-@EqualsAndHashCode
-@Accessors(prefix = {
-    "_",
-    ""
-})
-@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
-    @BuildableReference(ObjectMeta.class),
-    @BuildableReference(LabelSelector.class),
-    @BuildableReference(Container.class),
-    @BuildableReference(PodTemplateSpec.class),
-    @BuildableReference(ResourceRequirements.class),
-    @BuildableReference(IntOrString.class),
-    @BuildableReference(ObjectReference.class),
-    @BuildableReference(LocalObjectReference.class),
-    @BuildableReference(PersistentVolumeClaim.class)
-})
-@Generated("jsonschema2pojo")
-public class SubscriptionSpecCVPSDownwardAPI implements Editable<SubscriptionSpecCVPSDownwardAPIBuilder> , KubernetesResource
-{
-
-    @JsonProperty("items")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<SubscriptionSpecCVPSDAItems> items = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVPSDownwardAPI() {
-    }
-
-    public SubscriptionSpecCVPSDownwardAPI(List<SubscriptionSpecCVPSDAItems> items) {
-        super();
-        this.items = items;
-    }
-
-    @JsonProperty("items")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<SubscriptionSpecCVPSDAItems> getItems() {
-        return items;
-    }
-
-    @JsonProperty("items")
-    public void setItems(List<SubscriptionSpecCVPSDAItems> items) {
-        this.items = items;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVPSDownwardAPIBuilder edit() {
-        return new SubscriptionSpecCVPSDownwardAPIBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVPSDownwardAPIBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVPSSItems.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVPSSItems.java
deleted file mode 100644
index b0a0c46ef73..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVPSSItems.java
+++ /dev/null
@@ -1,136 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "mode",
-    "path"
-})
-@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 SubscriptionSpecCVPSSItems implements Editable<SubscriptionSpecCVPSSItemsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("mode")
-    private Integer mode;
-    @JsonProperty("path")
-    private String path;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVPSSItems() {
-    }
-
-    public SubscriptionSpecCVPSSItems(String key, Integer mode, String path) {
-        super();
-        this.key = key;
-        this.mode = mode;
-        this.path = path;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("mode")
-    public Integer getMode() {
-        return mode;
-    }
-
-    @JsonProperty("mode")
-    public void setMode(Integer mode) {
-        this.mode = mode;
-    }
-
-    @JsonProperty("path")
-    public String getPath() {
-        return path;
-    }
-
-    @JsonProperty("path")
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVPSSItemsBuilder edit() {
-        return new SubscriptionSpecCVPSSItemsBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVPSSItemsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVPSSecret.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVPSSecret.java
deleted file mode 100644
index 64da7c33266..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVPSSecret.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "items",
-    "name",
-    "optional"
-})
-@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 SubscriptionSpecCVPSSecret implements Editable<SubscriptionSpecCVPSSecretBuilder> , KubernetesResource
-{
-
-    @JsonProperty("items")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<SubscriptionSpecCVPSSItems> items = new ArrayList<>();
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("optional")
-    private Boolean optional;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVPSSecret() {
-    }
-
-    public SubscriptionSpecCVPSSecret(List<SubscriptionSpecCVPSSItems> items, String name, Boolean optional) {
-        super();
-        this.items = items;
-        this.name = name;
-        this.optional = optional;
-    }
-
-    @JsonProperty("items")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<SubscriptionSpecCVPSSItems> getItems() {
-        return items;
-    }
-
-    @JsonProperty("items")
-    public void setItems(List<SubscriptionSpecCVPSSItems> items) {
-        this.items = items;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("optional")
-    public Boolean getOptional() {
-        return optional;
-    }
-
-    @JsonProperty("optional")
-    public void setOptional(Boolean optional) {
-        this.optional = optional;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVPSSecretBuilder edit() {
-        return new SubscriptionSpecCVPSSecretBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVPSSecretBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVPSServiceAccountToken.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVPSServiceAccountToken.java
deleted file mode 100644
index 4adbc57759c..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVPSServiceAccountToken.java
+++ /dev/null
@@ -1,136 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "audience",
-    "expirationSeconds",
-    "path"
-})
-@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 SubscriptionSpecCVPSServiceAccountToken implements Editable<SubscriptionSpecCVPSServiceAccountTokenBuilder> , KubernetesResource
-{
-
-    @JsonProperty("audience")
-    private String audience;
-    @JsonProperty("expirationSeconds")
-    private Long expirationSeconds;
-    @JsonProperty("path")
-    private String path;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVPSServiceAccountToken() {
-    }
-
-    public SubscriptionSpecCVPSServiceAccountToken(String audience, Long expirationSeconds, String path) {
-        super();
-        this.audience = audience;
-        this.expirationSeconds = expirationSeconds;
-        this.path = path;
-    }
-
-    @JsonProperty("audience")
-    public String getAudience() {
-        return audience;
-    }
-
-    @JsonProperty("audience")
-    public void setAudience(String audience) {
-        this.audience = audience;
-    }
-
-    @JsonProperty("expirationSeconds")
-    public Long getExpirationSeconds() {
-        return expirationSeconds;
-    }
-
-    @JsonProperty("expirationSeconds")
-    public void setExpirationSeconds(Long expirationSeconds) {
-        this.expirationSeconds = expirationSeconds;
-    }
-
-    @JsonProperty("path")
-    public String getPath() {
-        return path;
-    }
-
-    @JsonProperty("path")
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVPSServiceAccountTokenBuilder edit() {
-        return new SubscriptionSpecCVPSServiceAccountTokenBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVPSServiceAccountTokenBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVPSources.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVPSources.java
deleted file mode 100644
index ac0b9df23f3..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVPSources.java
+++ /dev/null
@@ -1,164 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "clusterTrustBundle",
-    "configMap",
-    "downwardAPI",
-    "secret",
-    "serviceAccountToken"
-})
-@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 SubscriptionSpecCVPSources implements Editable<SubscriptionSpecCVPSourcesBuilder> , KubernetesResource
-{
-
-    @JsonProperty("clusterTrustBundle")
-    private SubscriptionSpecCVPSClusterTrustBundle clusterTrustBundle;
-    @JsonProperty("configMap")
-    private SubscriptionSpecCVPSConfigMap configMap;
-    @JsonProperty("downwardAPI")
-    private SubscriptionSpecCVPSDownwardAPI downwardAPI;
-    @JsonProperty("secret")
-    private SubscriptionSpecCVPSSecret secret;
-    @JsonProperty("serviceAccountToken")
-    private SubscriptionSpecCVPSServiceAccountToken serviceAccountToken;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVPSources() {
-    }
-
-    public SubscriptionSpecCVPSources(SubscriptionSpecCVPSClusterTrustBundle clusterTrustBundle, SubscriptionSpecCVPSConfigMap configMap, SubscriptionSpecCVPSDownwardAPI downwardAPI, SubscriptionSpecCVPSSecret secret, SubscriptionSpecCVPSServiceAccountToken serviceAccountToken) {
-        super();
-        this.clusterTrustBundle = clusterTrustBundle;
-        this.configMap = configMap;
-        this.downwardAPI = downwardAPI;
-        this.secret = secret;
-        this.serviceAccountToken = serviceAccountToken;
-    }
-
-    @JsonProperty("clusterTrustBundle")
-    public SubscriptionSpecCVPSClusterTrustBundle getClusterTrustBundle() {
-        return clusterTrustBundle;
-    }
-
-    @JsonProperty("clusterTrustBundle")
-    public void setClusterTrustBundle(SubscriptionSpecCVPSClusterTrustBundle clusterTrustBundle) {
-        this.clusterTrustBundle = clusterTrustBundle;
-    }
-
-    @JsonProperty("configMap")
-    public SubscriptionSpecCVPSConfigMap getConfigMap() {
-        return configMap;
-    }
-
-    @JsonProperty("configMap")
-    public void setConfigMap(SubscriptionSpecCVPSConfigMap configMap) {
-        this.configMap = configMap;
-    }
-
-    @JsonProperty("downwardAPI")
-    public SubscriptionSpecCVPSDownwardAPI getDownwardAPI() {
-        return downwardAPI;
-    }
-
-    @JsonProperty("downwardAPI")
-    public void setDownwardAPI(SubscriptionSpecCVPSDownwardAPI downwardAPI) {
-        this.downwardAPI = downwardAPI;
-    }
-
-    @JsonProperty("secret")
-    public SubscriptionSpecCVPSSecret getSecret() {
-        return secret;
-    }
-
-    @JsonProperty("secret")
-    public void setSecret(SubscriptionSpecCVPSSecret secret) {
-        this.secret = secret;
-    }
-
-    @JsonProperty("serviceAccountToken")
-    public SubscriptionSpecCVPSServiceAccountToken getServiceAccountToken() {
-        return serviceAccountToken;
-    }
-
-    @JsonProperty("serviceAccountToken")
-    public void setServiceAccountToken(SubscriptionSpecCVPSServiceAccountToken serviceAccountToken) {
-        this.serviceAccountToken = serviceAccountToken;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVPSourcesBuilder edit() {
-        return new SubscriptionSpecCVPSourcesBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVPSourcesBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVPersistentVolumeClaim.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVPersistentVolumeClaim.java
deleted file mode 100644
index b5e094b39d6..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVPersistentVolumeClaim.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "claimName",
-    "readOnly"
-})
-@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 SubscriptionSpecCVPersistentVolumeClaim implements Editable<SubscriptionSpecCVPersistentVolumeClaimBuilder> , KubernetesResource
-{
-
-    @JsonProperty("claimName")
-    private String claimName;
-    @JsonProperty("readOnly")
-    private Boolean readOnly;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVPersistentVolumeClaim() {
-    }
-
-    public SubscriptionSpecCVPersistentVolumeClaim(String claimName, Boolean readOnly) {
-        super();
-        this.claimName = claimName;
-        this.readOnly = readOnly;
-    }
-
-    @JsonProperty("claimName")
-    public String getClaimName() {
-        return claimName;
-    }
-
-    @JsonProperty("claimName")
-    public void setClaimName(String claimName) {
-        this.claimName = claimName;
-    }
-
-    @JsonProperty("readOnly")
-    public Boolean getReadOnly() {
-        return readOnly;
-    }
-
-    @JsonProperty("readOnly")
-    public void setReadOnly(Boolean readOnly) {
-        this.readOnly = readOnly;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVPersistentVolumeClaimBuilder edit() {
-        return new SubscriptionSpecCVPersistentVolumeClaimBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVPersistentVolumeClaimBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVPhotonPersistentDisk.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVPhotonPersistentDisk.java
deleted file mode 100644
index f7cc27b3ae5..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVPhotonPersistentDisk.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "fsType",
-    "pdID"
-})
-@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 SubscriptionSpecCVPhotonPersistentDisk implements Editable<SubscriptionSpecCVPhotonPersistentDiskBuilder> , KubernetesResource
-{
-
-    @JsonProperty("fsType")
-    private String fsType;
-    @JsonProperty("pdID")
-    private String pdID;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVPhotonPersistentDisk() {
-    }
-
-    public SubscriptionSpecCVPhotonPersistentDisk(String fsType, String pdID) {
-        super();
-        this.fsType = fsType;
-        this.pdID = pdID;
-    }
-
-    @JsonProperty("fsType")
-    public String getFsType() {
-        return fsType;
-    }
-
-    @JsonProperty("fsType")
-    public void setFsType(String fsType) {
-        this.fsType = fsType;
-    }
-
-    @JsonProperty("pdID")
-    public String getPdID() {
-        return pdID;
-    }
-
-    @JsonProperty("pdID")
-    public void setPdID(String pdID) {
-        this.pdID = pdID;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVPhotonPersistentDiskBuilder edit() {
-        return new SubscriptionSpecCVPhotonPersistentDiskBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVPhotonPersistentDiskBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVPortworxVolume.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVPortworxVolume.java
deleted file mode 100644
index 336836e4be1..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVPortworxVolume.java
+++ /dev/null
@@ -1,136 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "fsType",
-    "readOnly",
-    "volumeID"
-})
-@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 SubscriptionSpecCVPortworxVolume implements Editable<SubscriptionSpecCVPortworxVolumeBuilder> , KubernetesResource
-{
-
-    @JsonProperty("fsType")
-    private String fsType;
-    @JsonProperty("readOnly")
-    private Boolean readOnly;
-    @JsonProperty("volumeID")
-    private String volumeID;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVPortworxVolume() {
-    }
-
-    public SubscriptionSpecCVPortworxVolume(String fsType, Boolean readOnly, String volumeID) {
-        super();
-        this.fsType = fsType;
-        this.readOnly = readOnly;
-        this.volumeID = volumeID;
-    }
-
-    @JsonProperty("fsType")
-    public String getFsType() {
-        return fsType;
-    }
-
-    @JsonProperty("fsType")
-    public void setFsType(String fsType) {
-        this.fsType = fsType;
-    }
-
-    @JsonProperty("readOnly")
-    public Boolean getReadOnly() {
-        return readOnly;
-    }
-
-    @JsonProperty("readOnly")
-    public void setReadOnly(Boolean readOnly) {
-        this.readOnly = readOnly;
-    }
-
-    @JsonProperty("volumeID")
-    public String getVolumeID() {
-        return volumeID;
-    }
-
-    @JsonProperty("volumeID")
-    public void setVolumeID(String volumeID) {
-        this.volumeID = volumeID;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVPortworxVolumeBuilder edit() {
-        return new SubscriptionSpecCVPortworxVolumeBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVPortworxVolumeBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVProjected.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVProjected.java
deleted file mode 100644
index 1030e7f52c1..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVProjected.java
+++ /dev/null
@@ -1,126 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "defaultMode",
-    "sources"
-})
-@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 SubscriptionSpecCVProjected implements Editable<SubscriptionSpecCVProjectedBuilder> , KubernetesResource
-{
-
-    @JsonProperty("defaultMode")
-    private Integer defaultMode;
-    @JsonProperty("sources")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<SubscriptionSpecCVPSources> sources = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVProjected() {
-    }
-
-    public SubscriptionSpecCVProjected(Integer defaultMode, List<SubscriptionSpecCVPSources> sources) {
-        super();
-        this.defaultMode = defaultMode;
-        this.sources = sources;
-    }
-
-    @JsonProperty("defaultMode")
-    public Integer getDefaultMode() {
-        return defaultMode;
-    }
-
-    @JsonProperty("defaultMode")
-    public void setDefaultMode(Integer defaultMode) {
-        this.defaultMode = defaultMode;
-    }
-
-    @JsonProperty("sources")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<SubscriptionSpecCVPSources> getSources() {
-        return sources;
-    }
-
-    @JsonProperty("sources")
-    public void setSources(List<SubscriptionSpecCVPSources> sources) {
-        this.sources = sources;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVProjectedBuilder edit() {
-        return new SubscriptionSpecCVProjectedBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVProjectedBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVQuobyte.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVQuobyte.java
deleted file mode 100644
index 4d4219a8f41..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVQuobyte.java
+++ /dev/null
@@ -1,178 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "group",
-    "readOnly",
-    "registry",
-    "tenant",
-    "user",
-    "volume"
-})
-@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 SubscriptionSpecCVQuobyte implements Editable<SubscriptionSpecCVQuobyteBuilder> , KubernetesResource
-{
-
-    @JsonProperty("group")
-    private String group;
-    @JsonProperty("readOnly")
-    private Boolean readOnly;
-    @JsonProperty("registry")
-    private String registry;
-    @JsonProperty("tenant")
-    private String tenant;
-    @JsonProperty("user")
-    private String user;
-    @JsonProperty("volume")
-    private String volume;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVQuobyte() {
-    }
-
-    public SubscriptionSpecCVQuobyte(String group, Boolean readOnly, String registry, String tenant, String user, String volume) {
-        super();
-        this.group = group;
-        this.readOnly = readOnly;
-        this.registry = registry;
-        this.tenant = tenant;
-        this.user = user;
-        this.volume = volume;
-    }
-
-    @JsonProperty("group")
-    public String getGroup() {
-        return group;
-    }
-
-    @JsonProperty("group")
-    public void setGroup(String group) {
-        this.group = group;
-    }
-
-    @JsonProperty("readOnly")
-    public Boolean getReadOnly() {
-        return readOnly;
-    }
-
-    @JsonProperty("readOnly")
-    public void setReadOnly(Boolean readOnly) {
-        this.readOnly = readOnly;
-    }
-
-    @JsonProperty("registry")
-    public String getRegistry() {
-        return registry;
-    }
-
-    @JsonProperty("registry")
-    public void setRegistry(String registry) {
-        this.registry = registry;
-    }
-
-    @JsonProperty("tenant")
-    public String getTenant() {
-        return tenant;
-    }
-
-    @JsonProperty("tenant")
-    public void setTenant(String tenant) {
-        this.tenant = tenant;
-    }
-
-    @JsonProperty("user")
-    public String getUser() {
-        return user;
-    }
-
-    @JsonProperty("user")
-    public void setUser(String user) {
-        this.user = user;
-    }
-
-    @JsonProperty("volume")
-    public String getVolume() {
-        return volume;
-    }
-
-    @JsonProperty("volume")
-    public void setVolume(String volume) {
-        this.volume = volume;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVQuobyteBuilder edit() {
-        return new SubscriptionSpecCVQuobyteBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVQuobyteBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVRSecretRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVRSecretRef.java
deleted file mode 100644
index 5613e403ff4..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVRSecretRef.java
+++ /dev/null
@@ -1,108 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name"
-})
-@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 SubscriptionSpecCVRSecretRef implements Editable<SubscriptionSpecCVRSecretRefBuilder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVRSecretRef() {
-    }
-
-    public SubscriptionSpecCVRSecretRef(String name) {
-        super();
-        this.name = name;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVRSecretRefBuilder edit() {
-        return new SubscriptionSpecCVRSecretRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVRSecretRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVRbd.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVRbd.java
deleted file mode 100644
index aef91e761c5..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVRbd.java
+++ /dev/null
@@ -1,210 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "fsType",
-    "image",
-    "keyring",
-    "monitors",
-    "pool",
-    "readOnly",
-    "secretRef",
-    "user"
-})
-@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 SubscriptionSpecCVRbd implements Editable<SubscriptionSpecCVRbdBuilder> , KubernetesResource
-{
-
-    @JsonProperty("fsType")
-    private String fsType;
-    @JsonProperty("image")
-    private String image;
-    @JsonProperty("keyring")
-    private String keyring;
-    @JsonProperty("monitors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> monitors = new ArrayList<>();
-    @JsonProperty("pool")
-    private String pool;
-    @JsonProperty("readOnly")
-    private Boolean readOnly;
-    @JsonProperty("secretRef")
-    private SubscriptionSpecCVRSecretRef secretRef;
-    @JsonProperty("user")
-    private String user;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVRbd() {
-    }
-
-    public SubscriptionSpecCVRbd(String fsType, String image, String keyring, List<String> monitors, String pool, Boolean readOnly, SubscriptionSpecCVRSecretRef secretRef, String user) {
-        super();
-        this.fsType = fsType;
-        this.image = image;
-        this.keyring = keyring;
-        this.monitors = monitors;
-        this.pool = pool;
-        this.readOnly = readOnly;
-        this.secretRef = secretRef;
-        this.user = user;
-    }
-
-    @JsonProperty("fsType")
-    public String getFsType() {
-        return fsType;
-    }
-
-    @JsonProperty("fsType")
-    public void setFsType(String fsType) {
-        this.fsType = fsType;
-    }
-
-    @JsonProperty("image")
-    public String getImage() {
-        return image;
-    }
-
-    @JsonProperty("image")
-    public void setImage(String image) {
-        this.image = image;
-    }
-
-    @JsonProperty("keyring")
-    public String getKeyring() {
-        return keyring;
-    }
-
-    @JsonProperty("keyring")
-    public void setKeyring(String keyring) {
-        this.keyring = keyring;
-    }
-
-    @JsonProperty("monitors")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getMonitors() {
-        return monitors;
-    }
-
-    @JsonProperty("monitors")
-    public void setMonitors(List<String> monitors) {
-        this.monitors = monitors;
-    }
-
-    @JsonProperty("pool")
-    public String getPool() {
-        return pool;
-    }
-
-    @JsonProperty("pool")
-    public void setPool(String pool) {
-        this.pool = pool;
-    }
-
-    @JsonProperty("readOnly")
-    public Boolean getReadOnly() {
-        return readOnly;
-    }
-
-    @JsonProperty("readOnly")
-    public void setReadOnly(Boolean readOnly) {
-        this.readOnly = readOnly;
-    }
-
-    @JsonProperty("secretRef")
-    public SubscriptionSpecCVRSecretRef getSecretRef() {
-        return secretRef;
-    }
-
-    @JsonProperty("secretRef")
-    public void setSecretRef(SubscriptionSpecCVRSecretRef secretRef) {
-        this.secretRef = secretRef;
-    }
-
-    @JsonProperty("user")
-    public String getUser() {
-        return user;
-    }
-
-    @JsonProperty("user")
-    public void setUser(String user) {
-        this.user = user;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVRbdBuilder edit() {
-        return new SubscriptionSpecCVRbdBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVRbdBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVSISecretRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVSISecretRef.java
deleted file mode 100644
index c16e1971900..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVSISecretRef.java
+++ /dev/null
@@ -1,108 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name"
-})
-@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 SubscriptionSpecCVSISecretRef implements Editable<SubscriptionSpecCVSISecretRefBuilder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVSISecretRef() {
-    }
-
-    public SubscriptionSpecCVSISecretRef(String name) {
-        super();
-        this.name = name;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVSISecretRefBuilder edit() {
-        return new SubscriptionSpecCVSISecretRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVSISecretRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVSItems.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVSItems.java
deleted file mode 100644
index a16f4da235a..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVSItems.java
+++ /dev/null
@@ -1,136 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "key",
-    "mode",
-    "path"
-})
-@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 SubscriptionSpecCVSItems implements Editable<SubscriptionSpecCVSItemsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("mode")
-    private Integer mode;
-    @JsonProperty("path")
-    private String path;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVSItems() {
-    }
-
-    public SubscriptionSpecCVSItems(String key, Integer mode, String path) {
-        super();
-        this.key = key;
-        this.mode = mode;
-        this.path = path;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("mode")
-    public Integer getMode() {
-        return mode;
-    }
-
-    @JsonProperty("mode")
-    public void setMode(Integer mode) {
-        this.mode = mode;
-    }
-
-    @JsonProperty("path")
-    public String getPath() {
-        return path;
-    }
-
-    @JsonProperty("path")
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVSItemsBuilder edit() {
-        return new SubscriptionSpecCVSItemsBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVSItemsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVSSecretRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVSSecretRef.java
deleted file mode 100644
index e07b5fb27a1..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVSSecretRef.java
+++ /dev/null
@@ -1,108 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name"
-})
-@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 SubscriptionSpecCVSSecretRef implements Editable<SubscriptionSpecCVSSecretRefBuilder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVSSecretRef() {
-    }
-
-    public SubscriptionSpecCVSSecretRef(String name) {
-        super();
-        this.name = name;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVSSecretRefBuilder edit() {
-        return new SubscriptionSpecCVSSecretRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVSSecretRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVScaleIO.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVScaleIO.java
deleted file mode 100644
index 1a147cb71e4..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVScaleIO.java
+++ /dev/null
@@ -1,234 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "fsType",
-    "gateway",
-    "protectionDomain",
-    "readOnly",
-    "secretRef",
-    "sslEnabled",
-    "storageMode",
-    "storagePool",
-    "system",
-    "volumeName"
-})
-@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 SubscriptionSpecCVScaleIO implements Editable<SubscriptionSpecCVScaleIOBuilder> , KubernetesResource
-{
-
-    @JsonProperty("fsType")
-    private String fsType;
-    @JsonProperty("gateway")
-    private String gateway;
-    @JsonProperty("protectionDomain")
-    private String protectionDomain;
-    @JsonProperty("readOnly")
-    private Boolean readOnly;
-    @JsonProperty("secretRef")
-    private SubscriptionSpecCVSISecretRef secretRef;
-    @JsonProperty("sslEnabled")
-    private Boolean sslEnabled;
-    @JsonProperty("storageMode")
-    private String storageMode;
-    @JsonProperty("storagePool")
-    private String storagePool;
-    @JsonProperty("system")
-    private String system;
-    @JsonProperty("volumeName")
-    private String volumeName;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVScaleIO() {
-    }
-
-    public SubscriptionSpecCVScaleIO(String fsType, String gateway, String protectionDomain, Boolean readOnly, SubscriptionSpecCVSISecretRef secretRef, Boolean sslEnabled, String storageMode, String storagePool, String system, String volumeName) {
-        super();
-        this.fsType = fsType;
-        this.gateway = gateway;
-        this.protectionDomain = protectionDomain;
-        this.readOnly = readOnly;
-        this.secretRef = secretRef;
-        this.sslEnabled = sslEnabled;
-        this.storageMode = storageMode;
-        this.storagePool = storagePool;
-        this.system = system;
-        this.volumeName = volumeName;
-    }
-
-    @JsonProperty("fsType")
-    public String getFsType() {
-        return fsType;
-    }
-
-    @JsonProperty("fsType")
-    public void setFsType(String fsType) {
-        this.fsType = fsType;
-    }
-
-    @JsonProperty("gateway")
-    public String getGateway() {
-        return gateway;
-    }
-
-    @JsonProperty("gateway")
-    public void setGateway(String gateway) {
-        this.gateway = gateway;
-    }
-
-    @JsonProperty("protectionDomain")
-    public String getProtectionDomain() {
-        return protectionDomain;
-    }
-
-    @JsonProperty("protectionDomain")
-    public void setProtectionDomain(String protectionDomain) {
-        this.protectionDomain = protectionDomain;
-    }
-
-    @JsonProperty("readOnly")
-    public Boolean getReadOnly() {
-        return readOnly;
-    }
-
-    @JsonProperty("readOnly")
-    public void setReadOnly(Boolean readOnly) {
-        this.readOnly = readOnly;
-    }
-
-    @JsonProperty("secretRef")
-    public SubscriptionSpecCVSISecretRef getSecretRef() {
-        return secretRef;
-    }
-
-    @JsonProperty("secretRef")
-    public void setSecretRef(SubscriptionSpecCVSISecretRef secretRef) {
-        this.secretRef = secretRef;
-    }
-
-    @JsonProperty("sslEnabled")
-    public Boolean getSslEnabled() {
-        return sslEnabled;
-    }
-
-    @JsonProperty("sslEnabled")
-    public void setSslEnabled(Boolean sslEnabled) {
-        this.sslEnabled = sslEnabled;
-    }
-
-    @JsonProperty("storageMode")
-    public String getStorageMode() {
-        return storageMode;
-    }
-
-    @JsonProperty("storageMode")
-    public void setStorageMode(String storageMode) {
-        this.storageMode = storageMode;
-    }
-
-    @JsonProperty("storagePool")
-    public String getStoragePool() {
-        return storagePool;
-    }
-
-    @JsonProperty("storagePool")
-    public void setStoragePool(String storagePool) {
-        this.storagePool = storagePool;
-    }
-
-    @JsonProperty("system")
-    public String getSystem() {
-        return system;
-    }
-
-    @JsonProperty("system")
-    public void setSystem(String system) {
-        this.system = system;
-    }
-
-    @JsonProperty("volumeName")
-    public String getVolumeName() {
-        return volumeName;
-    }
-
-    @JsonProperty("volumeName")
-    public void setVolumeName(String volumeName) {
-        this.volumeName = volumeName;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVScaleIOBuilder edit() {
-        return new SubscriptionSpecCVScaleIOBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVScaleIOBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVSecret.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVSecret.java
deleted file mode 100644
index 23a14108074..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVSecret.java
+++ /dev/null
@@ -1,154 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "defaultMode",
-    "items",
-    "optional",
-    "secretName"
-})
-@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 SubscriptionSpecCVSecret implements Editable<SubscriptionSpecCVSecretBuilder> , KubernetesResource
-{
-
-    @JsonProperty("defaultMode")
-    private Integer defaultMode;
-    @JsonProperty("items")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<SubscriptionSpecCVSItems> items = new ArrayList<>();
-    @JsonProperty("optional")
-    private Boolean optional;
-    @JsonProperty("secretName")
-    private String secretName;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVSecret() {
-    }
-
-    public SubscriptionSpecCVSecret(Integer defaultMode, List<SubscriptionSpecCVSItems> items, Boolean optional, String secretName) {
-        super();
-        this.defaultMode = defaultMode;
-        this.items = items;
-        this.optional = optional;
-        this.secretName = secretName;
-    }
-
-    @JsonProperty("defaultMode")
-    public Integer getDefaultMode() {
-        return defaultMode;
-    }
-
-    @JsonProperty("defaultMode")
-    public void setDefaultMode(Integer defaultMode) {
-        this.defaultMode = defaultMode;
-    }
-
-    @JsonProperty("items")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<SubscriptionSpecCVSItems> getItems() {
-        return items;
-    }
-
-    @JsonProperty("items")
-    public void setItems(List<SubscriptionSpecCVSItems> items) {
-        this.items = items;
-    }
-
-    @JsonProperty("optional")
-    public Boolean getOptional() {
-        return optional;
-    }
-
-    @JsonProperty("optional")
-    public void setOptional(Boolean optional) {
-        this.optional = optional;
-    }
-
-    @JsonProperty("secretName")
-    public String getSecretName() {
-        return secretName;
-    }
-
-    @JsonProperty("secretName")
-    public void setSecretName(String secretName) {
-        this.secretName = secretName;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVSecretBuilder edit() {
-        return new SubscriptionSpecCVSecretBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVSecretBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVStorageos.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVStorageos.java
deleted file mode 100644
index ace6b5cd8ab..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVStorageos.java
+++ /dev/null
@@ -1,164 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "fsType",
-    "readOnly",
-    "secretRef",
-    "volumeName",
-    "volumeNamespace"
-})
-@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 SubscriptionSpecCVStorageos implements Editable<SubscriptionSpecCVStorageosBuilder> , KubernetesResource
-{
-
-    @JsonProperty("fsType")
-    private String fsType;
-    @JsonProperty("readOnly")
-    private Boolean readOnly;
-    @JsonProperty("secretRef")
-    private SubscriptionSpecCVSSecretRef secretRef;
-    @JsonProperty("volumeName")
-    private String volumeName;
-    @JsonProperty("volumeNamespace")
-    private String volumeNamespace;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVStorageos() {
-    }
-
-    public SubscriptionSpecCVStorageos(String fsType, Boolean readOnly, SubscriptionSpecCVSSecretRef secretRef, String volumeName, String volumeNamespace) {
-        super();
-        this.fsType = fsType;
-        this.readOnly = readOnly;
-        this.secretRef = secretRef;
-        this.volumeName = volumeName;
-        this.volumeNamespace = volumeNamespace;
-    }
-
-    @JsonProperty("fsType")
-    public String getFsType() {
-        return fsType;
-    }
-
-    @JsonProperty("fsType")
-    public void setFsType(String fsType) {
-        this.fsType = fsType;
-    }
-
-    @JsonProperty("readOnly")
-    public Boolean getReadOnly() {
-        return readOnly;
-    }
-
-    @JsonProperty("readOnly")
-    public void setReadOnly(Boolean readOnly) {
-        this.readOnly = readOnly;
-    }
-
-    @JsonProperty("secretRef")
-    public SubscriptionSpecCVSSecretRef getSecretRef() {
-        return secretRef;
-    }
-
-    @JsonProperty("secretRef")
-    public void setSecretRef(SubscriptionSpecCVSSecretRef secretRef) {
-        this.secretRef = secretRef;
-    }
-
-    @JsonProperty("volumeName")
-    public String getVolumeName() {
-        return volumeName;
-    }
-
-    @JsonProperty("volumeName")
-    public void setVolumeName(String volumeName) {
-        this.volumeName = volumeName;
-    }
-
-    @JsonProperty("volumeNamespace")
-    public String getVolumeNamespace() {
-        return volumeNamespace;
-    }
-
-    @JsonProperty("volumeNamespace")
-    public void setVolumeNamespace(String volumeNamespace) {
-        this.volumeNamespace = volumeNamespace;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVStorageosBuilder edit() {
-        return new SubscriptionSpecCVStorageosBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVStorageosBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVVsphereVolume.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVVsphereVolume.java
deleted file mode 100644
index 32904d7afb5..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVVsphereVolume.java
+++ /dev/null
@@ -1,150 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "fsType",
-    "storagePolicyID",
-    "storagePolicyName",
-    "volumePath"
-})
-@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 SubscriptionSpecCVVsphereVolume implements Editable<SubscriptionSpecCVVsphereVolumeBuilder> , KubernetesResource
-{
-
-    @JsonProperty("fsType")
-    private String fsType;
-    @JsonProperty("storagePolicyID")
-    private String storagePolicyID;
-    @JsonProperty("storagePolicyName")
-    private String storagePolicyName;
-    @JsonProperty("volumePath")
-    private String volumePath;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVVsphereVolume() {
-    }
-
-    public SubscriptionSpecCVVsphereVolume(String fsType, String storagePolicyID, String storagePolicyName, String volumePath) {
-        super();
-        this.fsType = fsType;
-        this.storagePolicyID = storagePolicyID;
-        this.storagePolicyName = storagePolicyName;
-        this.volumePath = volumePath;
-    }
-
-    @JsonProperty("fsType")
-    public String getFsType() {
-        return fsType;
-    }
-
-    @JsonProperty("fsType")
-    public void setFsType(String fsType) {
-        this.fsType = fsType;
-    }
-
-    @JsonProperty("storagePolicyID")
-    public String getStoragePolicyID() {
-        return storagePolicyID;
-    }
-
-    @JsonProperty("storagePolicyID")
-    public void setStoragePolicyID(String storagePolicyID) {
-        this.storagePolicyID = storagePolicyID;
-    }
-
-    @JsonProperty("storagePolicyName")
-    public String getStoragePolicyName() {
-        return storagePolicyName;
-    }
-
-    @JsonProperty("storagePolicyName")
-    public void setStoragePolicyName(String storagePolicyName) {
-        this.storagePolicyName = storagePolicyName;
-    }
-
-    @JsonProperty("volumePath")
-    public String getVolumePath() {
-        return volumePath;
-    }
-
-    @JsonProperty("volumePath")
-    public void setVolumePath(String volumePath) {
-        this.volumePath = volumePath;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVVsphereVolumeBuilder edit() {
-        return new SubscriptionSpecCVVsphereVolumeBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVVsphereVolumeBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVolumeMounts.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVolumeMounts.java
deleted file mode 100644
index f74a1118178..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVolumeMounts.java
+++ /dev/null
@@ -1,192 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "mountPath",
-    "mountPropagation",
-    "name",
-    "readOnly",
-    "recursiveReadOnly",
-    "subPath",
-    "subPathExpr"
-})
-@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 SubscriptionSpecCVolumeMounts implements Editable<SubscriptionSpecCVolumeMountsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("mountPath")
-    private String mountPath;
-    @JsonProperty("mountPropagation")
-    private String mountPropagation;
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("readOnly")
-    private Boolean readOnly;
-    @JsonProperty("recursiveReadOnly")
-    private String recursiveReadOnly;
-    @JsonProperty("subPath")
-    private String subPath;
-    @JsonProperty("subPathExpr")
-    private String subPathExpr;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVolumeMounts() {
-    }
-
-    public SubscriptionSpecCVolumeMounts(String mountPath, String mountPropagation, String name, Boolean readOnly, String recursiveReadOnly, String subPath, String subPathExpr) {
-        super();
-        this.mountPath = mountPath;
-        this.mountPropagation = mountPropagation;
-        this.name = name;
-        this.readOnly = readOnly;
-        this.recursiveReadOnly = recursiveReadOnly;
-        this.subPath = subPath;
-        this.subPathExpr = subPathExpr;
-    }
-
-    @JsonProperty("mountPath")
-    public String getMountPath() {
-        return mountPath;
-    }
-
-    @JsonProperty("mountPath")
-    public void setMountPath(String mountPath) {
-        this.mountPath = mountPath;
-    }
-
-    @JsonProperty("mountPropagation")
-    public String getMountPropagation() {
-        return mountPropagation;
-    }
-
-    @JsonProperty("mountPropagation")
-    public void setMountPropagation(String mountPropagation) {
-        this.mountPropagation = mountPropagation;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("readOnly")
-    public Boolean getReadOnly() {
-        return readOnly;
-    }
-
-    @JsonProperty("readOnly")
-    public void setReadOnly(Boolean readOnly) {
-        this.readOnly = readOnly;
-    }
-
-    @JsonProperty("recursiveReadOnly")
-    public String getRecursiveReadOnly() {
-        return recursiveReadOnly;
-    }
-
-    @JsonProperty("recursiveReadOnly")
-    public void setRecursiveReadOnly(String recursiveReadOnly) {
-        this.recursiveReadOnly = recursiveReadOnly;
-    }
-
-    @JsonProperty("subPath")
-    public String getSubPath() {
-        return subPath;
-    }
-
-    @JsonProperty("subPath")
-    public void setSubPath(String subPath) {
-        this.subPath = subPath;
-    }
-
-    @JsonProperty("subPathExpr")
-    public String getSubPathExpr() {
-        return subPathExpr;
-    }
-
-    @JsonProperty("subPathExpr")
-    public void setSubPathExpr(String subPathExpr) {
-        this.subPathExpr = subPathExpr;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVolumeMountsBuilder edit() {
-        return new SubscriptionSpecCVolumeMountsBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVolumeMountsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVolumes.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVolumes.java
deleted file mode 100644
index 07023d9b2e9..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionSpecCVolumes.java
+++ /dev/null
@@ -1,514 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "awsElasticBlockStore",
-    "azureDisk",
-    "azureFile",
-    "cephfs",
-    "cinder",
-    "configMap",
-    "csi",
-    "downwardAPI",
-    "emptyDir",
-    "ephemeral",
-    "fc",
-    "flexVolume",
-    "flocker",
-    "gcePersistentDisk",
-    "gitRepo",
-    "glusterfs",
-    "hostPath",
-    "iscsi",
-    "name",
-    "nfs",
-    "persistentVolumeClaim",
-    "photonPersistentDisk",
-    "portworxVolume",
-    "projected",
-    "quobyte",
-    "rbd",
-    "scaleIO",
-    "secret",
-    "storageos",
-    "vsphereVolume"
-})
-@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 SubscriptionSpecCVolumes implements Editable<SubscriptionSpecCVolumesBuilder> , KubernetesResource
-{
-
-    @JsonProperty("awsElasticBlockStore")
-    private SubscriptionSpecCVAwsElasticBlockStore awsElasticBlockStore;
-    @JsonProperty("azureDisk")
-    private SubscriptionSpecCVAzureDisk azureDisk;
-    @JsonProperty("azureFile")
-    private SubscriptionSpecCVAzureFile azureFile;
-    @JsonProperty("cephfs")
-    private SubscriptionSpecCVCephfs cephfs;
-    @JsonProperty("cinder")
-    private SubscriptionSpecCVCinder cinder;
-    @JsonProperty("configMap")
-    private SubscriptionSpecCVConfigMap configMap;
-    @JsonProperty("csi")
-    private SubscriptionSpecCVCsi csi;
-    @JsonProperty("downwardAPI")
-    private SubscriptionSpecCVDownwardAPI downwardAPI;
-    @JsonProperty("emptyDir")
-    private SubscriptionSpecCVEmptyDir emptyDir;
-    @JsonProperty("ephemeral")
-    private SubscriptionSpecCVEphemeral ephemeral;
-    @JsonProperty("fc")
-    private SubscriptionSpecCVFc fc;
-    @JsonProperty("flexVolume")
-    private SubscriptionSpecCVFlexVolume flexVolume;
-    @JsonProperty("flocker")
-    private SubscriptionSpecCVFlocker flocker;
-    @JsonProperty("gcePersistentDisk")
-    private SubscriptionSpecCVGcePersistentDisk gcePersistentDisk;
-    @JsonProperty("gitRepo")
-    private SubscriptionSpecCVGitRepo gitRepo;
-    @JsonProperty("glusterfs")
-    private SubscriptionSpecCVGlusterfs glusterfs;
-    @JsonProperty("hostPath")
-    private SubscriptionSpecCVHostPath hostPath;
-    @JsonProperty("iscsi")
-    private SubscriptionSpecCVIscsi iscsi;
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("nfs")
-    private SubscriptionSpecCVNfs nfs;
-    @JsonProperty("persistentVolumeClaim")
-    private SubscriptionSpecCVPersistentVolumeClaim persistentVolumeClaim;
-    @JsonProperty("photonPersistentDisk")
-    private SubscriptionSpecCVPhotonPersistentDisk photonPersistentDisk;
-    @JsonProperty("portworxVolume")
-    private SubscriptionSpecCVPortworxVolume portworxVolume;
-    @JsonProperty("projected")
-    private SubscriptionSpecCVProjected projected;
-    @JsonProperty("quobyte")
-    private SubscriptionSpecCVQuobyte quobyte;
-    @JsonProperty("rbd")
-    private SubscriptionSpecCVRbd rbd;
-    @JsonProperty("scaleIO")
-    private SubscriptionSpecCVScaleIO scaleIO;
-    @JsonProperty("secret")
-    private SubscriptionSpecCVSecret secret;
-    @JsonProperty("storageos")
-    private SubscriptionSpecCVStorageos storageos;
-    @JsonProperty("vsphereVolume")
-    private SubscriptionSpecCVVsphereVolume vsphereVolume;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionSpecCVolumes() {
-    }
-
-    public SubscriptionSpecCVolumes(SubscriptionSpecCVAwsElasticBlockStore awsElasticBlockStore, SubscriptionSpecCVAzureDisk azureDisk, SubscriptionSpecCVAzureFile azureFile, SubscriptionSpecCVCephfs cephfs, SubscriptionSpecCVCinder cinder, SubscriptionSpecCVConfigMap configMap, SubscriptionSpecCVCsi csi, SubscriptionSpecCVDownwardAPI downwardAPI, SubscriptionSpecCVEmptyDir emptyDir, SubscriptionSpecCVEphemeral ephemeral, SubscriptionSpecCVFc fc, SubscriptionSpecCVFlexVolume flexVolume, SubscriptionSpecCVFlocker flocker, SubscriptionSpecCVGcePersistentDisk gcePersistentDisk, SubscriptionSpecCVGitRepo gitRepo, SubscriptionSpecCVGlusterfs glusterfs, SubscriptionSpecCVHostPath hostPath, SubscriptionSpecCVIscsi iscsi, String name, SubscriptionSpecCVNfs nfs, SubscriptionSpecCVPersistentVolumeClaim persistentVolumeClaim, SubscriptionSpecCVPhotonPersistentDisk photonPersistentDisk, SubscriptionSpecCVPortworxVolume portworxVolume, SubscriptionSpecCVProjected projected, SubscriptionSpecCVQuobyte quobyte, SubscriptionSpecCVRbd rbd, SubscriptionSpecCVScaleIO scaleIO, SubscriptionSpecCVSecret secret, SubscriptionSpecCVStorageos storageos, SubscriptionSpecCVVsphereVolume vsphereVolume) {
-        super();
-        this.awsElasticBlockStore = awsElasticBlockStore;
-        this.azureDisk = azureDisk;
-        this.azureFile = azureFile;
-        this.cephfs = cephfs;
-        this.cinder = cinder;
-        this.configMap = configMap;
-        this.csi = csi;
-        this.downwardAPI = downwardAPI;
-        this.emptyDir = emptyDir;
-        this.ephemeral = ephemeral;
-        this.fc = fc;
-        this.flexVolume = flexVolume;
-        this.flocker = flocker;
-        this.gcePersistentDisk = gcePersistentDisk;
-        this.gitRepo = gitRepo;
-        this.glusterfs = glusterfs;
-        this.hostPath = hostPath;
-        this.iscsi = iscsi;
-        this.name = name;
-        this.nfs = nfs;
-        this.persistentVolumeClaim = persistentVolumeClaim;
-        this.photonPersistentDisk = photonPersistentDisk;
-        this.portworxVolume = portworxVolume;
-        this.projected = projected;
-        this.quobyte = quobyte;
-        this.rbd = rbd;
-        this.scaleIO = scaleIO;
-        this.secret = secret;
-        this.storageos = storageos;
-        this.vsphereVolume = vsphereVolume;
-    }
-
-    @JsonProperty("awsElasticBlockStore")
-    public SubscriptionSpecCVAwsElasticBlockStore getAwsElasticBlockStore() {
-        return awsElasticBlockStore;
-    }
-
-    @JsonProperty("awsElasticBlockStore")
-    public void setAwsElasticBlockStore(SubscriptionSpecCVAwsElasticBlockStore awsElasticBlockStore) {
-        this.awsElasticBlockStore = awsElasticBlockStore;
-    }
-
-    @JsonProperty("azureDisk")
-    public SubscriptionSpecCVAzureDisk getAzureDisk() {
-        return azureDisk;
-    }
-
-    @JsonProperty("azureDisk")
-    public void setAzureDisk(SubscriptionSpecCVAzureDisk azureDisk) {
-        this.azureDisk = azureDisk;
-    }
-
-    @JsonProperty("azureFile")
-    public SubscriptionSpecCVAzureFile getAzureFile() {
-        return azureFile;
-    }
-
-    @JsonProperty("azureFile")
-    public void setAzureFile(SubscriptionSpecCVAzureFile azureFile) {
-        this.azureFile = azureFile;
-    }
-
-    @JsonProperty("cephfs")
-    public SubscriptionSpecCVCephfs getCephfs() {
-        return cephfs;
-    }
-
-    @JsonProperty("cephfs")
-    public void setCephfs(SubscriptionSpecCVCephfs cephfs) {
-        this.cephfs = cephfs;
-    }
-
-    @JsonProperty("cinder")
-    public SubscriptionSpecCVCinder getCinder() {
-        return cinder;
-    }
-
-    @JsonProperty("cinder")
-    public void setCinder(SubscriptionSpecCVCinder cinder) {
-        this.cinder = cinder;
-    }
-
-    @JsonProperty("configMap")
-    public SubscriptionSpecCVConfigMap getConfigMap() {
-        return configMap;
-    }
-
-    @JsonProperty("configMap")
-    public void setConfigMap(SubscriptionSpecCVConfigMap configMap) {
-        this.configMap = configMap;
-    }
-
-    @JsonProperty("csi")
-    public SubscriptionSpecCVCsi getCsi() {
-        return csi;
-    }
-
-    @JsonProperty("csi")
-    public void setCsi(SubscriptionSpecCVCsi csi) {
-        this.csi = csi;
-    }
-
-    @JsonProperty("downwardAPI")
-    public SubscriptionSpecCVDownwardAPI getDownwardAPI() {
-        return downwardAPI;
-    }
-
-    @JsonProperty("downwardAPI")
-    public void setDownwardAPI(SubscriptionSpecCVDownwardAPI downwardAPI) {
-        this.downwardAPI = downwardAPI;
-    }
-
-    @JsonProperty("emptyDir")
-    public SubscriptionSpecCVEmptyDir getEmptyDir() {
-        return emptyDir;
-    }
-
-    @JsonProperty("emptyDir")
-    public void setEmptyDir(SubscriptionSpecCVEmptyDir emptyDir) {
-        this.emptyDir = emptyDir;
-    }
-
-    @JsonProperty("ephemeral")
-    public SubscriptionSpecCVEphemeral getEphemeral() {
-        return ephemeral;
-    }
-
-    @JsonProperty("ephemeral")
-    public void setEphemeral(SubscriptionSpecCVEphemeral ephemeral) {
-        this.ephemeral = ephemeral;
-    }
-
-    @JsonProperty("fc")
-    public SubscriptionSpecCVFc getFc() {
-        return fc;
-    }
-
-    @JsonProperty("fc")
-    public void setFc(SubscriptionSpecCVFc fc) {
-        this.fc = fc;
-    }
-
-    @JsonProperty("flexVolume")
-    public SubscriptionSpecCVFlexVolume getFlexVolume() {
-        return flexVolume;
-    }
-
-    @JsonProperty("flexVolume")
-    public void setFlexVolume(SubscriptionSpecCVFlexVolume flexVolume) {
-        this.flexVolume = flexVolume;
-    }
-
-    @JsonProperty("flocker")
-    public SubscriptionSpecCVFlocker getFlocker() {
-        return flocker;
-    }
-
-    @JsonProperty("flocker")
-    public void setFlocker(SubscriptionSpecCVFlocker flocker) {
-        this.flocker = flocker;
-    }
-
-    @JsonProperty("gcePersistentDisk")
-    public SubscriptionSpecCVGcePersistentDisk getGcePersistentDisk() {
-        return gcePersistentDisk;
-    }
-
-    @JsonProperty("gcePersistentDisk")
-    public void setGcePersistentDisk(SubscriptionSpecCVGcePersistentDisk gcePersistentDisk) {
-        this.gcePersistentDisk = gcePersistentDisk;
-    }
-
-    @JsonProperty("gitRepo")
-    public SubscriptionSpecCVGitRepo getGitRepo() {
-        return gitRepo;
-    }
-
-    @JsonProperty("gitRepo")
-    public void setGitRepo(SubscriptionSpecCVGitRepo gitRepo) {
-        this.gitRepo = gitRepo;
-    }
-
-    @JsonProperty("glusterfs")
-    public SubscriptionSpecCVGlusterfs getGlusterfs() {
-        return glusterfs;
-    }
-
-    @JsonProperty("glusterfs")
-    public void setGlusterfs(SubscriptionSpecCVGlusterfs glusterfs) {
-        this.glusterfs = glusterfs;
-    }
-
-    @JsonProperty("hostPath")
-    public SubscriptionSpecCVHostPath getHostPath() {
-        return hostPath;
-    }
-
-    @JsonProperty("hostPath")
-    public void setHostPath(SubscriptionSpecCVHostPath hostPath) {
-        this.hostPath = hostPath;
-    }
-
-    @JsonProperty("iscsi")
-    public SubscriptionSpecCVIscsi getIscsi() {
-        return iscsi;
-    }
-
-    @JsonProperty("iscsi")
-    public void setIscsi(SubscriptionSpecCVIscsi iscsi) {
-        this.iscsi = iscsi;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("nfs")
-    public SubscriptionSpecCVNfs getNfs() {
-        return nfs;
-    }
-
-    @JsonProperty("nfs")
-    public void setNfs(SubscriptionSpecCVNfs nfs) {
-        this.nfs = nfs;
-    }
-
-    @JsonProperty("persistentVolumeClaim")
-    public SubscriptionSpecCVPersistentVolumeClaim getPersistentVolumeClaim() {
-        return persistentVolumeClaim;
-    }
-
-    @JsonProperty("persistentVolumeClaim")
-    public void setPersistentVolumeClaim(SubscriptionSpecCVPersistentVolumeClaim persistentVolumeClaim) {
-        this.persistentVolumeClaim = persistentVolumeClaim;
-    }
-
-    @JsonProperty("photonPersistentDisk")
-    public SubscriptionSpecCVPhotonPersistentDisk getPhotonPersistentDisk() {
-        return photonPersistentDisk;
-    }
-
-    @JsonProperty("photonPersistentDisk")
-    public void setPhotonPersistentDisk(SubscriptionSpecCVPhotonPersistentDisk photonPersistentDisk) {
-        this.photonPersistentDisk = photonPersistentDisk;
-    }
-
-    @JsonProperty("portworxVolume")
-    public SubscriptionSpecCVPortworxVolume getPortworxVolume() {
-        return portworxVolume;
-    }
-
-    @JsonProperty("portworxVolume")
-    public void setPortworxVolume(SubscriptionSpecCVPortworxVolume portworxVolume) {
-        this.portworxVolume = portworxVolume;
-    }
-
-    @JsonProperty("projected")
-    public SubscriptionSpecCVProjected getProjected() {
-        return projected;
-    }
-
-    @JsonProperty("projected")
-    public void setProjected(SubscriptionSpecCVProjected projected) {
-        this.projected = projected;
-    }
-
-    @JsonProperty("quobyte")
-    public SubscriptionSpecCVQuobyte getQuobyte() {
-        return quobyte;
-    }
-
-    @JsonProperty("quobyte")
-    public void setQuobyte(SubscriptionSpecCVQuobyte quobyte) {
-        this.quobyte = quobyte;
-    }
-
-    @JsonProperty("rbd")
-    public SubscriptionSpecCVRbd getRbd() {
-        return rbd;
-    }
-
-    @JsonProperty("rbd")
-    public void setRbd(SubscriptionSpecCVRbd rbd) {
-        this.rbd = rbd;
-    }
-
-    @JsonProperty("scaleIO")
-    public SubscriptionSpecCVScaleIO getScaleIO() {
-        return scaleIO;
-    }
-
-    @JsonProperty("scaleIO")
-    public void setScaleIO(SubscriptionSpecCVScaleIO scaleIO) {
-        this.scaleIO = scaleIO;
-    }
-
-    @JsonProperty("secret")
-    public SubscriptionSpecCVSecret getSecret() {
-        return secret;
-    }
-
-    @JsonProperty("secret")
-    public void setSecret(SubscriptionSpecCVSecret secret) {
-        this.secret = secret;
-    }
-
-    @JsonProperty("storageos")
-    public SubscriptionSpecCVStorageos getStorageos() {
-        return storageos;
-    }
-
-    @JsonProperty("storageos")
-    public void setStorageos(SubscriptionSpecCVStorageos storageos) {
-        this.storageos = storageos;
-    }
-
-    @JsonProperty("vsphereVolume")
-    public SubscriptionSpecCVVsphereVolume getVsphereVolume() {
-        return vsphereVolume;
-    }
-
-    @JsonProperty("vsphereVolume")
-    public void setVsphereVolume(SubscriptionSpecCVVsphereVolume vsphereVolume) {
-        this.vsphereVolume = vsphereVolume;
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVolumesBuilder edit() {
-        return new SubscriptionSpecCVolumesBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionSpecCVolumesBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionStatus.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionStatus.java
index 344ebefe6c4..4634d7b7ddb 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionStatus.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionStatus.java
@@ -67,20 +67,20 @@ public class SubscriptionStatus implements Editable<SubscriptionStatusBuilder> ,
 
     @JsonProperty("catalogHealth")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<SubscriptionStatusCatalogHealth> catalogHealth = new ArrayList<>();
+    private List<SubscriptionCatalogHealth> catalogHealth = new ArrayList<>();
     @JsonProperty("conditions")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<SubscriptionStatusConditions> conditions = new ArrayList<>();
+    private List<SubscriptionCondition> conditions = new ArrayList<>();
     @JsonProperty("currentCSV")
     private String currentCSV;
     @JsonProperty("installPlanGeneration")
     private Integer installPlanGeneration;
     @JsonProperty("installPlanRef")
-    private SubscriptionStatusInstallPlanRef installPlanRef;
+    private ObjectReference installPlanRef;
     @JsonProperty("installedCSV")
     private String installedCSV;
     @JsonProperty("installplan")
-    private SubscriptionStatusInstallplan installplan;
+    private InstallPlanReference installplan;
     @JsonProperty("lastUpdated")
     private String lastUpdated;
     @JsonProperty("reason")
@@ -97,7 +97,7 @@ public class SubscriptionStatus implements Editable<SubscriptionStatusBuilder> ,
     public SubscriptionStatus() {
     }
 
-    public SubscriptionStatus(List<SubscriptionStatusCatalogHealth> catalogHealth, List<SubscriptionStatusConditions> conditions, String currentCSV, Integer installPlanGeneration, SubscriptionStatusInstallPlanRef installPlanRef, String installedCSV, SubscriptionStatusInstallplan installplan, String lastUpdated, String reason, String state) {
+    public SubscriptionStatus(List<SubscriptionCatalogHealth> catalogHealth, List<SubscriptionCondition> conditions, String currentCSV, Integer installPlanGeneration, ObjectReference installPlanRef, String installedCSV, InstallPlanReference installplan, String lastUpdated, String reason, String state) {
         super();
         this.catalogHealth = catalogHealth;
         this.conditions = conditions;
@@ -113,23 +113,23 @@ public SubscriptionStatus(List<SubscriptionStatusCatalogHealth> catalogHealth, L
 
     @JsonProperty("catalogHealth")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<SubscriptionStatusCatalogHealth> getCatalogHealth() {
+    public List<SubscriptionCatalogHealth> getCatalogHealth() {
         return catalogHealth;
     }
 
     @JsonProperty("catalogHealth")
-    public void setCatalogHealth(List<SubscriptionStatusCatalogHealth> catalogHealth) {
+    public void setCatalogHealth(List<SubscriptionCatalogHealth> catalogHealth) {
         this.catalogHealth = catalogHealth;
     }
 
     @JsonProperty("conditions")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<SubscriptionStatusConditions> getConditions() {
+    public List<SubscriptionCondition> getConditions() {
         return conditions;
     }
 
     @JsonProperty("conditions")
-    public void setConditions(List<SubscriptionStatusConditions> conditions) {
+    public void setConditions(List<SubscriptionCondition> conditions) {
         this.conditions = conditions;
     }
 
@@ -154,12 +154,12 @@ public void setInstallPlanGeneration(Integer installPlanGeneration) {
     }
 
     @JsonProperty("installPlanRef")
-    public SubscriptionStatusInstallPlanRef getInstallPlanRef() {
+    public ObjectReference getInstallPlanRef() {
         return installPlanRef;
     }
 
     @JsonProperty("installPlanRef")
-    public void setInstallPlanRef(SubscriptionStatusInstallPlanRef installPlanRef) {
+    public void setInstallPlanRef(ObjectReference installPlanRef) {
         this.installPlanRef = installPlanRef;
     }
 
@@ -174,12 +174,12 @@ public void setInstalledCSV(String installedCSV) {
     }
 
     @JsonProperty("installplan")
-    public SubscriptionStatusInstallplan getInstallplan() {
+    public InstallPlanReference getInstallplan() {
         return installplan;
     }
 
     @JsonProperty("installplan")
-    public void setInstallplan(SubscriptionStatusInstallplan installplan) {
+    public void setInstallplan(InstallPlanReference installplan) {
         this.installplan = installplan;
     }
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionStatusCHCatalogSourceRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionStatusCHCatalogSourceRef.java
deleted file mode 100644
index 552dce732b6..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionStatusCHCatalogSourceRef.java
+++ /dev/null
@@ -1,192 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "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 SubscriptionStatusCHCatalogSourceRef implements Editable<SubscriptionStatusCHCatalogSourceRefBuilder> , 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<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionStatusCHCatalogSourceRef() {
-    }
-
-    public SubscriptionStatusCHCatalogSourceRef(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 SubscriptionStatusCHCatalogSourceRefBuilder edit() {
-        return new SubscriptionStatusCHCatalogSourceRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionStatusCHCatalogSourceRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionStatusInstallPlanRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionStatusInstallPlanRef.java
deleted file mode 100644
index 290d519a0cd..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionStatusInstallPlanRef.java
+++ /dev/null
@@ -1,192 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "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 SubscriptionStatusInstallPlanRef implements Editable<SubscriptionStatusInstallPlanRefBuilder> , 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<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public SubscriptionStatusInstallPlanRef() {
-    }
-
-    public SubscriptionStatusInstallPlanRef(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 SubscriptionStatusInstallPlanRefBuilder edit() {
-        return new SubscriptionStatusInstallPlanRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public SubscriptionStatusInstallPlanRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecUpdateStrategy.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/UpdateStrategy.java
similarity index 83%
rename from kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecUpdateStrategy.java
rename to kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/UpdateStrategy.java
index cce389cfd36..d61654223d7 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceSpecUpdateStrategy.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/UpdateStrategy.java
@@ -51,11 +51,11 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class CatalogSourceSpecUpdateStrategy implements Editable<CatalogSourceSpecUpdateStrategyBuilder> , KubernetesResource
+public class UpdateStrategy implements Editable<UpdateStrategyBuilder> , KubernetesResource
 {
 
     @JsonProperty("registryPoll")
-    private CatalogSourceSpecUSRegistryPoll registryPoll;
+    private RegistryPoll registryPoll;
     @JsonIgnore
     private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
 
@@ -63,31 +63,31 @@ public class CatalogSourceSpecUpdateStrategy implements Editable<CatalogSourceSp
      * No args constructor for use in serialization
      * 
      */
-    public CatalogSourceSpecUpdateStrategy() {
+    public UpdateStrategy() {
     }
 
-    public CatalogSourceSpecUpdateStrategy(CatalogSourceSpecUSRegistryPoll registryPoll) {
+    public UpdateStrategy(RegistryPoll registryPoll) {
         super();
         this.registryPoll = registryPoll;
     }
 
     @JsonProperty("registryPoll")
-    public CatalogSourceSpecUSRegistryPoll getRegistryPoll() {
+    public RegistryPoll getRegistryPoll() {
         return registryPoll;
     }
 
     @JsonProperty("registryPoll")
-    public void setRegistryPoll(CatalogSourceSpecUSRegistryPoll registryPoll) {
+    public void setRegistryPoll(RegistryPoll registryPoll) {
         this.registryPoll = registryPoll;
     }
 
     @JsonIgnore
-    public CatalogSourceSpecUpdateStrategyBuilder edit() {
-        return new CatalogSourceSpecUpdateStrategyBuilder(this);
+    public UpdateStrategyBuilder edit() {
+        return new UpdateStrategyBuilder(this);
     }
 
     @JsonIgnore
-    public CatalogSourceSpecUpdateStrategyBuilder toBuilder() {
+    public UpdateStrategyBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecWebhookdefinitions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/WebhookDescription.java
similarity index 84%
rename from kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecWebhookdefinitions.java
rename to kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/WebhookDescription.java
index 6f0c60e031a..eeb37006403 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionSpecWebhookdefinitions.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/WebhookDescription.java
@@ -24,6 +24,7 @@
 import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
 import io.fabric8.kubernetes.api.model.PodTemplateSpec;
 import io.fabric8.kubernetes.api.model.ResourceRequirements;
+import io.fabric8.kubernetes.api.model.admissionregistration.v1.RuleWithOperations;
 import io.sundr.builder.annotations.Buildable;
 import io.sundr.builder.annotations.BuildableReference;
 import lombok.EqualsAndHashCode;
@@ -67,7 +68,7 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class ClusterServiceVersionSpecWebhookdefinitions implements Editable<ClusterServiceVersionSpecWebhookdefinitionsBuilder> , KubernetesResource
+public class WebhookDescription implements Editable<WebhookDescriptionBuilder> , KubernetesResource
 {
 
     @JsonProperty("admissionReviewVersions")
@@ -87,17 +88,16 @@ public class ClusterServiceVersionSpecWebhookdefinitions implements Editable<Clu
     @JsonProperty("matchPolicy")
     private String matchPolicy;
     @JsonProperty("objectSelector")
-    private ClusterServiceVersionSpecWObjectSelector objectSelector;
+    private LabelSelector objectSelector;
     @JsonProperty("reinvocationPolicy")
     private String reinvocationPolicy;
     @JsonProperty("rules")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ClusterServiceVersionSpecWRules> rules = new ArrayList<>();
+    private List<RuleWithOperations> rules = new ArrayList<>();
     @JsonProperty("sideEffects")
     private String sideEffects;
     @JsonProperty("targetPort")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    private Object targetPort;
+    private IntOrString targetPort;
     @JsonProperty("timeoutSeconds")
     private Integer timeoutSeconds;
     @JsonProperty("type")
@@ -111,10 +111,10 @@ public class ClusterServiceVersionSpecWebhookdefinitions implements Editable<Clu
      * No args constructor for use in serialization
      * 
      */
-    public ClusterServiceVersionSpecWebhookdefinitions() {
+    public WebhookDescription() {
     }
 
-    public ClusterServiceVersionSpecWebhookdefinitions(List<String> admissionReviewVersions, Integer containerPort, List<String> conversionCRDs, String deploymentName, String failurePolicy, String generateName, String matchPolicy, ClusterServiceVersionSpecWObjectSelector objectSelector, String reinvocationPolicy, List<ClusterServiceVersionSpecWRules> rules, String sideEffects, Object targetPort, Integer timeoutSeconds, String type, String webhookPath) {
+    public WebhookDescription(List<String> admissionReviewVersions, Integer containerPort, List<String> conversionCRDs, String deploymentName, String failurePolicy, String generateName, String matchPolicy, LabelSelector objectSelector, String reinvocationPolicy, List<RuleWithOperations> rules, String sideEffects, IntOrString targetPort, Integer timeoutSeconds, String type, String webhookPath) {
         super();
         this.admissionReviewVersions = admissionReviewVersions;
         this.containerPort = containerPort;
@@ -206,12 +206,12 @@ public void setMatchPolicy(String matchPolicy) {
     }
 
     @JsonProperty("objectSelector")
-    public ClusterServiceVersionSpecWObjectSelector getObjectSelector() {
+    public LabelSelector getObjectSelector() {
         return objectSelector;
     }
 
     @JsonProperty("objectSelector")
-    public void setObjectSelector(ClusterServiceVersionSpecWObjectSelector objectSelector) {
+    public void setObjectSelector(LabelSelector objectSelector) {
         this.objectSelector = objectSelector;
     }
 
@@ -227,12 +227,12 @@ public void setReinvocationPolicy(String reinvocationPolicy) {
 
     @JsonProperty("rules")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ClusterServiceVersionSpecWRules> getRules() {
+    public List<RuleWithOperations> getRules() {
         return rules;
     }
 
     @JsonProperty("rules")
-    public void setRules(List<ClusterServiceVersionSpecWRules> rules) {
+    public void setRules(List<RuleWithOperations> rules) {
         this.rules = rules;
     }
 
@@ -247,13 +247,12 @@ public void setSideEffects(String sideEffects) {
     }
 
     @JsonProperty("targetPort")
-    public Object getTargetPort() {
+    public IntOrString getTargetPort() {
         return targetPort;
     }
 
     @JsonProperty("targetPort")
-    @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class)
-    public void setTargetPort(Object targetPort) {
+    public void setTargetPort(IntOrString targetPort) {
         this.targetPort = targetPort;
     }
 
@@ -288,12 +287,12 @@ public void setWebhookPath(String webhookPath) {
     }
 
     @JsonIgnore
-    public ClusterServiceVersionSpecWebhookdefinitionsBuilder edit() {
-        return new ClusterServiceVersionSpecWebhookdefinitionsBuilder(this);
+    public WebhookDescriptionBuilder edit() {
+        return new WebhookDescriptionBuilder(this);
     }
 
     @JsonIgnore
-    public ClusterServiceVersionSpecWebhookdefinitionsBuilder toBuilder() {
+    public WebhookDescriptionBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha2/OperatorGroupSpec.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha2/OperatorGroupSpec.java
index 9592d1300f2..17903e78b3c 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha2/OperatorGroupSpec.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha2/OperatorGroupSpec.java
@@ -60,7 +60,7 @@ public class OperatorGroupSpec implements Editable<OperatorGroupSpecBuilder> , K
 {
 
     @JsonProperty("selector")
-    private OperatorGroupSpecSelector selector;
+    private LabelSelector selector;
     @JsonProperty("serviceAccountName")
     private String serviceAccountName;
     @JsonProperty("staticProvidedAPIs")
@@ -78,7 +78,7 @@ public class OperatorGroupSpec implements Editable<OperatorGroupSpecBuilder> , K
     public OperatorGroupSpec() {
     }
 
-    public OperatorGroupSpec(OperatorGroupSpecSelector selector, String serviceAccountName, Boolean staticProvidedAPIs, List<String> targetNamespaces) {
+    public OperatorGroupSpec(LabelSelector selector, String serviceAccountName, Boolean staticProvidedAPIs, List<String> targetNamespaces) {
         super();
         this.selector = selector;
         this.serviceAccountName = serviceAccountName;
@@ -87,12 +87,12 @@ public OperatorGroupSpec(OperatorGroupSpecSelector selector, String serviceAccou
     }
 
     @JsonProperty("selector")
-    public OperatorGroupSpecSelector getSelector() {
+    public LabelSelector getSelector() {
         return selector;
     }
 
     @JsonProperty("selector")
-    public void setSelector(OperatorGroupSpecSelector selector) {
+    public void setSelector(LabelSelector selector) {
         this.selector = selector;
     }
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha2/OperatorGroupSpecSMatchExpressions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha2/OperatorGroupSpecSMatchExpressions.java
deleted file mode 100644
index 3526bf3aeff..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha2/OperatorGroupSpecSMatchExpressions.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha2;
-
-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({
-    "key",
-    "operator",
-    "values"
-})
-@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 OperatorGroupSpecSMatchExpressions implements Editable<OperatorGroupSpecSMatchExpressionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("key")
-    private String key;
-    @JsonProperty("operator")
-    private String operator;
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<String> values = new ArrayList<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public OperatorGroupSpecSMatchExpressions() {
-    }
-
-    public OperatorGroupSpecSMatchExpressions(String key, String operator, List<String> values) {
-        super();
-        this.key = key;
-        this.operator = operator;
-        this.values = values;
-    }
-
-    @JsonProperty("key")
-    public String getKey() {
-        return key;
-    }
-
-    @JsonProperty("key")
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @JsonProperty("operator")
-    public String getOperator() {
-        return operator;
-    }
-
-    @JsonProperty("operator")
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    @JsonProperty("values")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<String> getValues() {
-        return values;
-    }
-
-    @JsonProperty("values")
-    public void setValues(List<String> values) {
-        this.values = values;
-    }
-
-    @JsonIgnore
-    public OperatorGroupSpecSMatchExpressionsBuilder edit() {
-        return new OperatorGroupSpecSMatchExpressionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public OperatorGroupSpecSMatchExpressionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha2/OperatorGroupSpecSelector.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha2/OperatorGroupSpecSelector.java
deleted file mode 100644
index 3623aa9f196..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha2/OperatorGroupSpecSelector.java
+++ /dev/null
@@ -1,128 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha2;
-
-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({
-    "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 OperatorGroupSpecSelector implements Editable<OperatorGroupSpecSelectorBuilder> , KubernetesResource
-{
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<OperatorGroupSpecSMatchExpressions> matchExpressions = new ArrayList<>();
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, String> matchLabels = new LinkedHashMap<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public OperatorGroupSpecSelector() {
-    }
-
-    public OperatorGroupSpecSelector(List<OperatorGroupSpecSMatchExpressions> matchExpressions, Map<String, String> matchLabels) {
-        super();
-        this.matchExpressions = matchExpressions;
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<OperatorGroupSpecSMatchExpressions> getMatchExpressions() {
-        return matchExpressions;
-    }
-
-    @JsonProperty("matchExpressions")
-    public void setMatchExpressions(List<OperatorGroupSpecSMatchExpressions> matchExpressions) {
-        this.matchExpressions = matchExpressions;
-    }
-
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, String> getMatchLabels() {
-        return matchLabels;
-    }
-
-    @JsonProperty("matchLabels")
-    public void setMatchLabels(Map<String, String> matchLabels) {
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonIgnore
-    public OperatorGroupSpecSelectorBuilder edit() {
-        return new OperatorGroupSpecSelectorBuilder(this);
-    }
-
-    @JsonIgnore
-    public OperatorGroupSpecSelectorBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha2/OperatorGroupStatus.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha2/OperatorGroupStatus.java
index a7ff987c616..73dabc4743b 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha2/OperatorGroupStatus.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha2/OperatorGroupStatus.java
@@ -64,7 +64,7 @@ public class OperatorGroupStatus implements Editable<OperatorGroupStatusBuilder>
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private List<String> namespaces = new ArrayList<>();
     @JsonProperty("serviceAccountRef")
-    private OperatorGroupStatusServiceAccountRef serviceAccountRef;
+    private ObjectReference serviceAccountRef;
     @JsonIgnore
     private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
 
@@ -75,7 +75,7 @@ public class OperatorGroupStatus implements Editable<OperatorGroupStatusBuilder>
     public OperatorGroupStatus() {
     }
 
-    public OperatorGroupStatus(String lastUpdated, List<String> namespaces, OperatorGroupStatusServiceAccountRef serviceAccountRef) {
+    public OperatorGroupStatus(String lastUpdated, List<String> namespaces, ObjectReference serviceAccountRef) {
         super();
         this.lastUpdated = lastUpdated;
         this.namespaces = namespaces;
@@ -104,12 +104,12 @@ public void setNamespaces(List<String> namespaces) {
     }
 
     @JsonProperty("serviceAccountRef")
-    public OperatorGroupStatusServiceAccountRef getServiceAccountRef() {
+    public ObjectReference getServiceAccountRef() {
         return serviceAccountRef;
     }
 
     @JsonProperty("serviceAccountRef")
-    public void setServiceAccountRef(OperatorGroupStatusServiceAccountRef serviceAccountRef) {
+    public void setServiceAccountRef(ObjectReference serviceAccountRef) {
         this.serviceAccountRef = serviceAccountRef;
     }
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha2/OperatorGroupStatusServiceAccountRef.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha2/OperatorGroupStatusServiceAccountRef.java
deleted file mode 100644
index 31ae8a8a0d6..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha2/OperatorGroupStatusServiceAccountRef.java
+++ /dev/null
@@ -1,192 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v1alpha2;
-
-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 OperatorGroupStatusServiceAccountRef implements Editable<OperatorGroupStatusServiceAccountRefBuilder> , 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<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public OperatorGroupStatusServiceAccountRef() {
-    }
-
-    public OperatorGroupStatusServiceAccountRef(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 OperatorGroupStatusServiceAccountRefBuilder edit() {
-        return new OperatorGroupStatusServiceAccountRefBuilder(this);
-    }
-
-    @JsonIgnore
-    public OperatorGroupStatusServiceAccountRefBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v2/OperatorConditionSpec.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v2/OperatorConditionSpec.java
index 7d2ff8af6b3..ea9d434b043 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v2/OperatorConditionSpec.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v2/OperatorConditionSpec.java
@@ -14,6 +14,7 @@
 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.Condition;
 import io.fabric8.kubernetes.api.model.Container;
 import io.fabric8.kubernetes.api.model.IntOrString;
 import io.fabric8.kubernetes.api.model.KubernetesResource;
@@ -61,13 +62,13 @@ public class OperatorConditionSpec implements Editable<OperatorConditionSpecBuil
 
     @JsonProperty("conditions")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<OperatorConditionSpecConditions> conditions = new ArrayList<>();
+    private List<Condition> conditions = new ArrayList<>();
     @JsonProperty("deployments")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private List<String> deployments = new ArrayList<>();
     @JsonProperty("overrides")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<OperatorConditionSpecOverrides> overrides = new ArrayList<>();
+    private List<Condition> overrides = new ArrayList<>();
     @JsonProperty("serviceAccounts")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private List<String> serviceAccounts = new ArrayList<>();
@@ -81,7 +82,7 @@ public class OperatorConditionSpec implements Editable<OperatorConditionSpecBuil
     public OperatorConditionSpec() {
     }
 
-    public OperatorConditionSpec(List<OperatorConditionSpecConditions> conditions, List<String> deployments, List<OperatorConditionSpecOverrides> overrides, List<String> serviceAccounts) {
+    public OperatorConditionSpec(List<Condition> conditions, List<String> deployments, List<Condition> overrides, List<String> serviceAccounts) {
         super();
         this.conditions = conditions;
         this.deployments = deployments;
@@ -91,12 +92,12 @@ public OperatorConditionSpec(List<OperatorConditionSpecConditions> conditions, L
 
     @JsonProperty("conditions")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<OperatorConditionSpecConditions> getConditions() {
+    public List<Condition> getConditions() {
         return conditions;
     }
 
     @JsonProperty("conditions")
-    public void setConditions(List<OperatorConditionSpecConditions> conditions) {
+    public void setConditions(List<Condition> conditions) {
         this.conditions = conditions;
     }
 
@@ -113,12 +114,12 @@ public void setDeployments(List<String> deployments) {
 
     @JsonProperty("overrides")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<OperatorConditionSpecOverrides> getOverrides() {
+    public List<Condition> getOverrides() {
         return overrides;
     }
 
     @JsonProperty("overrides")
-    public void setOverrides(List<OperatorConditionSpecOverrides> overrides) {
+    public void setOverrides(List<Condition> overrides) {
         this.overrides = overrides;
     }
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v2/OperatorConditionSpecConditions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v2/OperatorConditionSpecConditions.java
deleted file mode 100644
index 2d817e3c61b..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v2/OperatorConditionSpecConditions.java
+++ /dev/null
@@ -1,178 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v2;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "lastTransitionTime",
-    "message",
-    "observedGeneration",
-    "reason",
-    "status",
-    "type"
-})
-@ToString
-@EqualsAndHashCode
-@Accessors(prefix = {
-    "_",
-    ""
-})
-@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
-    @BuildableReference(ObjectMeta.class),
-    @BuildableReference(LabelSelector.class),
-    @BuildableReference(Container.class),
-    @BuildableReference(PodTemplateSpec.class),
-    @BuildableReference(ResourceRequirements.class),
-    @BuildableReference(IntOrString.class),
-    @BuildableReference(ObjectReference.class),
-    @BuildableReference(LocalObjectReference.class),
-    @BuildableReference(PersistentVolumeClaim.class)
-})
-@Generated("jsonschema2pojo")
-public class OperatorConditionSpecConditions implements Editable<OperatorConditionSpecConditionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("lastTransitionTime")
-    private String lastTransitionTime;
-    @JsonProperty("message")
-    private String message;
-    @JsonProperty("observedGeneration")
-    private Long observedGeneration;
-    @JsonProperty("reason")
-    private String reason;
-    @JsonProperty("status")
-    private String status;
-    @JsonProperty("type")
-    private String type;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public OperatorConditionSpecConditions() {
-    }
-
-    public OperatorConditionSpecConditions(String lastTransitionTime, String message, Long observedGeneration, String reason, String status, String type) {
-        super();
-        this.lastTransitionTime = lastTransitionTime;
-        this.message = message;
-        this.observedGeneration = observedGeneration;
-        this.reason = reason;
-        this.status = status;
-        this.type = type;
-    }
-
-    @JsonProperty("lastTransitionTime")
-    public String getLastTransitionTime() {
-        return lastTransitionTime;
-    }
-
-    @JsonProperty("lastTransitionTime")
-    public void setLastTransitionTime(String lastTransitionTime) {
-        this.lastTransitionTime = lastTransitionTime;
-    }
-
-    @JsonProperty("message")
-    public String getMessage() {
-        return message;
-    }
-
-    @JsonProperty("message")
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    @JsonProperty("observedGeneration")
-    public Long getObservedGeneration() {
-        return observedGeneration;
-    }
-
-    @JsonProperty("observedGeneration")
-    public void setObservedGeneration(Long observedGeneration) {
-        this.observedGeneration = observedGeneration;
-    }
-
-    @JsonProperty("reason")
-    public String getReason() {
-        return reason;
-    }
-
-    @JsonProperty("reason")
-    public void setReason(String reason) {
-        this.reason = reason;
-    }
-
-    @JsonProperty("status")
-    public String getStatus() {
-        return status;
-    }
-
-    @JsonProperty("status")
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    @JsonProperty("type")
-    public String getType() {
-        return type;
-    }
-
-    @JsonProperty("type")
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    @JsonIgnore
-    public OperatorConditionSpecConditionsBuilder edit() {
-        return new OperatorConditionSpecConditionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public OperatorConditionSpecConditionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v2/OperatorConditionSpecOverrides.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v2/OperatorConditionSpecOverrides.java
deleted file mode 100644
index 547d5de6248..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v2/OperatorConditionSpecOverrides.java
+++ /dev/null
@@ -1,178 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v2;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "lastTransitionTime",
-    "message",
-    "observedGeneration",
-    "reason",
-    "status",
-    "type"
-})
-@ToString
-@EqualsAndHashCode
-@Accessors(prefix = {
-    "_",
-    ""
-})
-@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
-    @BuildableReference(ObjectMeta.class),
-    @BuildableReference(LabelSelector.class),
-    @BuildableReference(Container.class),
-    @BuildableReference(PodTemplateSpec.class),
-    @BuildableReference(ResourceRequirements.class),
-    @BuildableReference(IntOrString.class),
-    @BuildableReference(ObjectReference.class),
-    @BuildableReference(LocalObjectReference.class),
-    @BuildableReference(PersistentVolumeClaim.class)
-})
-@Generated("jsonschema2pojo")
-public class OperatorConditionSpecOverrides implements Editable<OperatorConditionSpecOverridesBuilder> , KubernetesResource
-{
-
-    @JsonProperty("lastTransitionTime")
-    private String lastTransitionTime;
-    @JsonProperty("message")
-    private String message;
-    @JsonProperty("observedGeneration")
-    private Long observedGeneration;
-    @JsonProperty("reason")
-    private String reason;
-    @JsonProperty("status")
-    private String status;
-    @JsonProperty("type")
-    private String type;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public OperatorConditionSpecOverrides() {
-    }
-
-    public OperatorConditionSpecOverrides(String lastTransitionTime, String message, Long observedGeneration, String reason, String status, String type) {
-        super();
-        this.lastTransitionTime = lastTransitionTime;
-        this.message = message;
-        this.observedGeneration = observedGeneration;
-        this.reason = reason;
-        this.status = status;
-        this.type = type;
-    }
-
-    @JsonProperty("lastTransitionTime")
-    public String getLastTransitionTime() {
-        return lastTransitionTime;
-    }
-
-    @JsonProperty("lastTransitionTime")
-    public void setLastTransitionTime(String lastTransitionTime) {
-        this.lastTransitionTime = lastTransitionTime;
-    }
-
-    @JsonProperty("message")
-    public String getMessage() {
-        return message;
-    }
-
-    @JsonProperty("message")
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    @JsonProperty("observedGeneration")
-    public Long getObservedGeneration() {
-        return observedGeneration;
-    }
-
-    @JsonProperty("observedGeneration")
-    public void setObservedGeneration(Long observedGeneration) {
-        this.observedGeneration = observedGeneration;
-    }
-
-    @JsonProperty("reason")
-    public String getReason() {
-        return reason;
-    }
-
-    @JsonProperty("reason")
-    public void setReason(String reason) {
-        this.reason = reason;
-    }
-
-    @JsonProperty("status")
-    public String getStatus() {
-        return status;
-    }
-
-    @JsonProperty("status")
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    @JsonProperty("type")
-    public String getType() {
-        return type;
-    }
-
-    @JsonProperty("type")
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    @JsonIgnore
-    public OperatorConditionSpecOverridesBuilder edit() {
-        return new OperatorConditionSpecOverridesBuilder(this);
-    }
-
-    @JsonIgnore
-    public OperatorConditionSpecOverridesBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v2/OperatorConditionStatus.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v2/OperatorConditionStatus.java
index 7cc26fc9a13..28765170d6d 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v2/OperatorConditionStatus.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v2/OperatorConditionStatus.java
@@ -14,6 +14,7 @@
 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.Condition;
 import io.fabric8.kubernetes.api.model.Container;
 import io.fabric8.kubernetes.api.model.IntOrString;
 import io.fabric8.kubernetes.api.model.KubernetesResource;
@@ -58,7 +59,7 @@ public class OperatorConditionStatus implements Editable<OperatorConditionStatus
 
     @JsonProperty("conditions")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<OperatorConditionStatusConditions> conditions = new ArrayList<>();
+    private List<Condition> conditions = new ArrayList<>();
     @JsonIgnore
     private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
 
@@ -69,19 +70,19 @@ public class OperatorConditionStatus implements Editable<OperatorConditionStatus
     public OperatorConditionStatus() {
     }
 
-    public OperatorConditionStatus(List<OperatorConditionStatusConditions> conditions) {
+    public OperatorConditionStatus(List<Condition> conditions) {
         super();
         this.conditions = conditions;
     }
 
     @JsonProperty("conditions")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<OperatorConditionStatusConditions> getConditions() {
+    public List<Condition> getConditions() {
         return conditions;
     }
 
     @JsonProperty("conditions")
-    public void setConditions(List<OperatorConditionStatusConditions> conditions) {
+    public void setConditions(List<Condition> conditions) {
         this.conditions = conditions;
     }
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v2/OperatorConditionStatusConditions.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v2/OperatorConditionStatusConditions.java
deleted file mode 100644
index fde4f151414..00000000000
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v2/OperatorConditionStatusConditions.java
+++ /dev/null
@@ -1,178 +0,0 @@
-
-package io.fabric8.openshift.api.model.operatorhub.v2;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "lastTransitionTime",
-    "message",
-    "observedGeneration",
-    "reason",
-    "status",
-    "type"
-})
-@ToString
-@EqualsAndHashCode
-@Accessors(prefix = {
-    "_",
-    ""
-})
-@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
-    @BuildableReference(ObjectMeta.class),
-    @BuildableReference(LabelSelector.class),
-    @BuildableReference(Container.class),
-    @BuildableReference(PodTemplateSpec.class),
-    @BuildableReference(ResourceRequirements.class),
-    @BuildableReference(IntOrString.class),
-    @BuildableReference(ObjectReference.class),
-    @BuildableReference(LocalObjectReference.class),
-    @BuildableReference(PersistentVolumeClaim.class)
-})
-@Generated("jsonschema2pojo")
-public class OperatorConditionStatusConditions implements Editable<OperatorConditionStatusConditionsBuilder> , KubernetesResource
-{
-
-    @JsonProperty("lastTransitionTime")
-    private String lastTransitionTime;
-    @JsonProperty("message")
-    private String message;
-    @JsonProperty("observedGeneration")
-    private Long observedGeneration;
-    @JsonProperty("reason")
-    private String reason;
-    @JsonProperty("status")
-    private String status;
-    @JsonProperty("type")
-    private String type;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public OperatorConditionStatusConditions() {
-    }
-
-    public OperatorConditionStatusConditions(String lastTransitionTime, String message, Long observedGeneration, String reason, String status, String type) {
-        super();
-        this.lastTransitionTime = lastTransitionTime;
-        this.message = message;
-        this.observedGeneration = observedGeneration;
-        this.reason = reason;
-        this.status = status;
-        this.type = type;
-    }
-
-    @JsonProperty("lastTransitionTime")
-    public String getLastTransitionTime() {
-        return lastTransitionTime;
-    }
-
-    @JsonProperty("lastTransitionTime")
-    public void setLastTransitionTime(String lastTransitionTime) {
-        this.lastTransitionTime = lastTransitionTime;
-    }
-
-    @JsonProperty("message")
-    public String getMessage() {
-        return message;
-    }
-
-    @JsonProperty("message")
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    @JsonProperty("observedGeneration")
-    public Long getObservedGeneration() {
-        return observedGeneration;
-    }
-
-    @JsonProperty("observedGeneration")
-    public void setObservedGeneration(Long observedGeneration) {
-        this.observedGeneration = observedGeneration;
-    }
-
-    @JsonProperty("reason")
-    public String getReason() {
-        return reason;
-    }
-
-    @JsonProperty("reason")
-    public void setReason(String reason) {
-        this.reason = reason;
-    }
-
-    @JsonProperty("status")
-    public String getStatus() {
-        return status;
-    }
-
-    @JsonProperty("status")
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    @JsonProperty("type")
-    public String getType() {
-        return type;
-    }
-
-    @JsonProperty("type")
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    @JsonIgnore
-    public OperatorConditionStatusConditionsBuilder edit() {
-        return new OperatorConditionStatusConditionsBuilder(this);
-    }
-
-    @JsonIgnore
-    public OperatorConditionStatusConditionsBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}