Skip to content

Commit

Permalink
Fix fabric8io#2321: Add new objects to OpenShift model
Browse files Browse the repository at this point in the history
  • Loading branch information
rohanKanojia committed Aug 13, 2020
1 parent e8c47dc commit b8fd8f0
Show file tree
Hide file tree
Showing 28 changed files with 104,664 additions and 4,381 deletions.
12 changes: 7 additions & 5 deletions kubernetes-model-generator/go.mod
Expand Up @@ -3,11 +3,13 @@ module github.com/fabric8io/kubernetes-client/kubernetes-model-generator
go 1.14

require (
github.com/openshift/api v0.0.0-20200413201024-c6e8c9b6eb9a
k8s.io/api v0.18.0
k8s.io/apiextensions-apiserver v0.18.0
k8s.io/apimachinery v0.18.0
k8s.io/client-go v0.18.0
github.com/openshift/api v0.0.0-20200803131051-87466835fcc0
github.com/operator-framework/api v0.3.12
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee // indirect
k8s.io/api v0.19.0-rc.2
k8s.io/apiextensions-apiserver v0.18.2
k8s.io/apimachinery v0.19.0-rc.2
k8s.io/client-go v0.18.2
k8s.io/kubernetes v1.18.0
k8s.io/metrics v0.18.0
)
Expand Down
142 changes: 140 additions & 2 deletions kubernetes-model-generator/go.sum

Large diffs are not rendered by default.

Expand Up @@ -23,6 +23,7 @@ import (
authapi "github.com/openshift/api/authorization/v1"
buildapi "github.com/openshift/api/build/v1"
openshiftconfigapi "github.com/openshift/api/config/v1"
consoleapi "github.com/openshift/api/console/v1"
imageapi "github.com/openshift/api/image/v1"
networkapi "github.com/openshift/api/network/v1"
oauthapi "github.com/openshift/api/oauth/v1"
Expand All @@ -32,6 +33,7 @@ import (
templateapi "github.com/openshift/api/template/v1"
userapi "github.com/openshift/api/user/v1"
authenticationapi "k8s.io/api/authentication/v1"
quotaapi "github.com/openshift/api/quota/v1"
rbac "k8s.io/api/rbac/v1" // depends
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand All @@ -56,6 +58,11 @@ type Schema struct {
TypeMeta metav1.TypeMeta
SecurityContextConstraints securityapi.SecurityContextConstraints
SecurityContextConstraintsList securityapi.SecurityContextConstraintsList
PodSecurityPolicyReview securityapi.PodSecurityPolicyReview
PodSecurityPolicySelfSubjectReview securityapi.PodSecurityPolicySelfSubjectReview
PodSecurityPolicySubjectReview securityapi.PodSecurityPolicySubjectReview
RangeAllocation securityapi.RangeAllocation
RangeAllocationList securityapi.RangeAllocationList
Status metav1.Status
Patch metav1.Patch
ListOptions metav1.ListOptions
Expand All @@ -70,9 +77,13 @@ type Schema struct {
BuildList buildapi.BuildList
BuildConfigList buildapi.BuildConfigList
ImageList imageapi.ImageList
ImageTag imageapi.ImageTag
ImageTagList imageapi.ImageTagList
ImageStreamList imageapi.ImageStreamList
ImageStreamTagList imageapi.ImageStreamTagList
ImageStreamImport imageapi.ImageStreamImport
ImageStreamImage imageapi.ImageStreamImage
ImageStreamMapping imageapi.ImageStreamMapping
DeploymentConfig appsapi.DeploymentConfig
DeploymentConfigList appsapi.DeploymentConfigList
Route routeapi.Route
Expand All @@ -97,8 +108,12 @@ type Schema struct {
OpenshiftRoleBindingRestriction authapi.RoleBindingRestriction
OpenshiftRoleBindingRestrictionSpec authapi.RoleBindingRestrictionSpec
LocalSubjectAccessReview authapi.LocalSubjectAccessReview
LocalResourceAccessReview authapi.LocalResourceAccessReview
ResourceAccessReview authapi.ResourceAccessReview
SubjectAccessReview authapi.SubjectAccessReview
SubjectAccessReviewResponse authapi.SubjectAccessReviewResponse
SubjectRulesReview authapi.SubjectRulesReview
SelfSubjectRulesReview authapi.SelfSubjectRulesReview
OpenshiftClusterRole authapi.ClusterRole
OpenshiftClusterRoleList authapi.ClusterRoleList
OpenshiftClusterRoleBinding authapi.ClusterRoleBinding
Expand All @@ -119,8 +134,53 @@ type Schema struct {
AggregationRule rbac.AggregationRule
NetNamespace networkapi.NetNamespace
NetNamespaceList networkapi.NetNamespaceList
ClusterNetwork networkapi.ClusterNetwork
ClusterNetworkList networkapi.ClusterNetworkList
EgressNetworkPolicy networkapi.EgressNetworkPolicy
EgressNetworkPolicyList networkapi.EgressNetworkPolicyList
ClusterVersion openshiftconfigapi.ClusterVersion
ClusterVersionList openshiftconfigapi.ClusterVersionList
SecretNameReference openshiftconfigapi.SecretNameReference
ConfigMapFileReference openshiftconfigapi.ConfigMapFileReference
APIServer openshiftconfigapi.APIServer
APIServerList openshiftconfigapi.APIServerList
Authentication openshiftconfigapi.Authentication
AuthenticationList openshiftconfigapi.AuthenticationList
ClusterOperator openshiftconfigapi.ClusterOperator
ClusterOperatorList openshiftconfigapi.ClusterOperatorList
Console openshiftconfigapi.Console
ConsoleList openshiftconfigapi.ConsoleList
DNS openshiftconfigapi.DNS
DNSList openshiftconfigapi.DNSList
FeatureGate openshiftconfigapi.FeatureGate
FeatureGateList openshiftconfigapi.FeatureGateList
Infrastructure openshiftconfigapi.Infrastructure
InfrastructureList openshiftconfigapi.InfrastructureList
Network openshiftconfigapi.Network
NetworkList openshiftconfigapi.NetworkList
OAuth openshiftconfigapi.OAuth
OAuthList openshiftconfigapi.OAuthList
OperatorHub openshiftconfigapi.OperatorHub
OperatorHubList openshiftconfigapi.OperatorHubList
Proxy openshiftconfigapi.Proxy
ProxyList openshiftconfigapi.ProxyList
Scheduler openshiftconfigapi.Scheduler
SchedulerList openshiftconfigapi.SchedulerList
TLSProfileSpec openshiftconfigapi.TLSProfileSpec
ConsoleCLIDownload consoleapi.ConsoleCLIDownload
ConsoleCLIDownloadList consoleapi.ConsoleCLIDownloadList
ConsoleExternalLogLink consoleapi.ConsoleExternalLogLink
ConsoleExternalLogLinkList consoleapi.ConsoleExternalLogLinkList
ConsoleLink consoleapi.ConsoleLink
ConsoleLinkList consoleapi.ConsoleLinkList
ConsoleNotification consoleapi.ConsoleNotification
ConsoleNotificationList consoleapi.ConsoleNotificationList
ConsoleYAMLSample consoleapi.ConsoleYAMLSample
ConsoleYAMLSampleList consoleapi.ConsoleYAMLSampleList
AppliedClusterResourceQuota quotaapi.AppliedClusterResourceQuota
AppliedClusterResourceQuotaList quotaapi.AppliedClusterResourceQuotaList
ClusterResourceQuota quotaapi.ClusterResourceQuota
ClusterResourceQuotaList quotaapi.ClusterResourceQuotaList
}

func main() {
Expand All @@ -145,6 +205,8 @@ func main() {
{"github.com/openshift/api/security/v1", "", "io.fabric8.openshift.api.model", "os_security_"},
{"github.com/openshift/api/network/v1", "", "io.fabric8.openshift.api.model", "os_network_"},
{"github.com/openshift/api/config/v1", "", "io.fabric8.openshift.api.model", "os_config_"},
{"github.com/openshift/api/console/v1", "", "io.fabric8.openshift.api.model.console.v1", "os_console_v1_"},
{"github.com/openshift/api/quota/v1", "", "io.fabric8.openshift.api.model", "os_quota_"},
{"k8s.io/kubernetes/pkg/api/unversioned", "", "io.fabric8.kubernetes.api.model", "api_"},
{"k8s.io/api/authentication/v1", "authentication.k8s.io", "io.fabric8.kubernetes.api.model.authentication", "kubernetes_authentication_"},
{"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1", "", "io.fabric8.kubernetes.api.model.apiextensions", "kubernetes_apiextensions_"},
Expand Down
@@ -0,0 +1,65 @@
package io.fabric8.openshift.api.model;

import java.util.ArrayList;
import java.util.HashMap;
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.model.Affinity;
import io.fabric8.kubernetes.api.model.Doneable;
import io.fabric8.kubernetes.api.model.KubernetesResource;
import io.fabric8.kubernetes.api.model.ObjectMeta;
import io.fabric8.kubernetes.api.model.PodDNSConfig;
import io.fabric8.kubernetes.api.model.PodSecurityContext;
import io.fabric8.kubernetes.api.model.Toleration;
import io.fabric8.kubernetes.api.model.Volume;
import io.sundr.builder.annotations.Buildable;
import io.sundr.builder.annotations.BuildableReference;
import io.sundr.builder.annotations.Inline;
import lombok.EqualsAndHashCode;
import lombok.ToString;

@JsonInclude(JsonInclude.Include.NON_NULL)
@Generated("org.jsonschema2pojo")
@JsonPropertyOrder({
"affinity",
"automountServiceAccountToken",
"dnsConfig",
"dnsPolicy",
"enableServiceLinks",
"nodeSelector",
"priorityClassName",
"runtimeClassName",
"schedulerName",
"securityContext",
"tolerations",
"volumes"
})
@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
@ToString
@EqualsAndHashCode
@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, builderPackage = "io.fabric8.kubernetes.api.builder", inline = {
@Inline(type = Doneable.class, prefix = "Doneable", value = "done")
}, refs = {
@BuildableReference(ObjectMeta.class)
})
public class OperatorVersion {
private Long major;
private Long minor;
private Long patch;
private List<PRVersion> pre;
private List<String> build;

private class PRVersion {
private String versionStr;
private Long versionNum;
private Boolean isNum;
}
}

0 comments on commit b8fd8f0

Please sign in to comment.