diff --git a/doc/MIGRATION-v7.md b/doc/MIGRATION-v7.md index be038526752..b8806e8d429 100644 --- a/doc/MIGRATION-v7.md +++ b/doc/MIGRATION-v7.md @@ -50,6 +50,8 @@ It is no longer published, the `io.fabric8:kubernetes-client-api` or `io.fabric8 Some of the types and packages have been moved to more suiting modules and package names. +- `io.openshift.helm` API group is now part of the `openshift-model-miscellaneus` module. + ### Service Catalog removed (operator.openshift.io) The operator.openshift.io APIs have been deprecated since OpenShift 4.1. diff --git a/kubernetes-itests/src/test/java/io/fabric8/openshift/OpenShiftAuthorizationIT.java b/kubernetes-itests/src/test/java/io/fabric8/openshift/OpenShiftAuthorizationIT.java index 55740b72732..440bd89d7f4 100644 --- a/kubernetes-itests/src/test/java/io/fabric8/openshift/OpenShiftAuthorizationIT.java +++ b/kubernetes-itests/src/test/java/io/fabric8/openshift/OpenShiftAuthorizationIT.java @@ -37,8 +37,6 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -import java.util.Collections; - import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -167,8 +165,9 @@ void createRoleBindingRestriction() { RoleBindingRestriction roleBindingRestriction = new RoleBindingRestrictionBuilder() .withNewMetadata().withName(name).endMetadata() .withNewSpec() - .withGrouprestriction( - Collections.singletonMap("groups", Collections.singletonList("groups-rolebindingrestriction"))) + .withNewGrouprestriction() + .addToGroups("groups-rolebindingrestriction") + .endGrouprestriction() .endSpec() .build(); diff --git a/kubernetes-model-generator/openapi/generator/cmd/reflection.go b/kubernetes-model-generator/openapi/generator/cmd/reflection.go index 205a7d085e8..8fc61f065cf 100644 --- a/kubernetes-model-generator/openapi/generator/cmd/reflection.go +++ b/kubernetes-model-generator/openapi/generator/cmd/reflection.go @@ -17,10 +17,8 @@ package main import ( "github.com/getkin/kin-openapi/openapi3" - openshiftauthorizationv1 "github.com/openshift/api/authorization/v1" openshiftmachinev1 "github.com/openshift/api/machine/v1" openshiftmachinev1alpha1 "github.com/openshift/api/machine/v1alpha1" - openshiftsecurityv1 "github.com/openshift/api/security/v1" "github.com/spf13/cobra" admissionV1 "k8s.io/api/admission/v1" admissionV1Beta1 "k8s.io/api/admission/v1beta1" @@ -121,21 +119,12 @@ var reflectionRun = func(cmd *cobra.Command, args []string) { reflect.TypeOf(metricsV1Beta1.PodMetricsList{}): {true, metricsV1Beta1.SchemeGroupVersion.String(), "pods", true}, reflect.TypeOf(metricsV1Beta1.PodMetrics{}): {false, metricsV1Beta1.SchemeGroupVersion.String(), "pods", true}, }, "metrics"), - NewTypeSchema([]reflect.Type{ - reflect.TypeOf(openshiftauthorizationv1.SubjectAccessReviewResponse{}), - reflect.TypeOf(openshiftauthorizationv1.ResourceAccessReviewResponse{}), - }, "openshift-authorization"), // Provider Specs are not included in OpenAPI https://docs.openshift.com/container-platform/4.16/machine_management/index.html#machine-mgmt-intro-managing-compute_overview-of-machine-management NewPathSchema(map[reflect.Type]ApiVersion{ reflect.TypeOf(openshiftmachinev1alpha1.OpenstackProviderSpec{}): {false, openshiftmachinev1alpha1.GroupVersion.String(), "openstackproviderspecs", true}, reflect.TypeOf(openshiftmachinev1.NutanixMachineProviderConfig{}): {false, openshiftmachinev1.GroupVersion.String(), "nutanixmachineproviderconfigs", true}, reflect.TypeOf(openshiftmachinev1.PowerVSMachineProviderConfig{}): {false, openshiftmachinev1.GroupVersion.String(), "powervsmachineproviderconfigs", true}, }, "openshift-machine"), - // OpenAPI spec contains incomplete information for SecurityContextConstraints (only nested inline until certain level) - NewPathSchema(map[reflect.Type]ApiVersion{ - reflect.TypeOf(openshiftsecurityv1.SecurityContextConstraintsList{}): {true, openshiftsecurityv1.GroupVersion.String(), "securitycontextconstraints", false}, - reflect.TypeOf(openshiftsecurityv1.SecurityContextConstraints{}): {false, openshiftsecurityv1.GroupVersion.String(), "securitycontextconstraints", false}, - }, "openshift-security"), } generate(schemas, targetDirectory) } diff --git a/kubernetes-model-generator/openapi/generator/pkg/parser/parser.go b/kubernetes-model-generator/openapi/generator/pkg/parser/parser.go index e445466251f..fc0f7c6f9d5 100644 --- a/kubernetes-model-generator/openapi/generator/pkg/parser/parser.go +++ b/kubernetes-model-generator/openapi/generator/pkg/parser/parser.go @@ -26,7 +26,8 @@ const genClient = "+genclient" const genClientPrefix = genClient + ":" const groupNamePrefix = "+groupName=" -var listType = types.ParseFullyQualifiedName("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta") +var listMeta = types.ParseFullyQualifiedName("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta") +var typeMeta = types.ParseFullyQualifiedName("k8s.io/apimachinery/pkg/apis/meta/v1.TypeMeta") type Module struct { Name string @@ -111,18 +112,32 @@ func groupName(pkg *types.Package) string { } func resolveType(typ *types.Type) string { - // Check if the type is a top-level type (Object) + // types with a genClient annotation are always objects + // types with a listType are always lists + // types with metaType are always lists or objects for _, c := range append(typ.CommentLines, typ.SecondClosestCommentLines...) { if strings.TrimSpace(c) == genClient { return "object" } } - // Check if the type is a list + isList := false + isObject := false for _, m := range typ.Members { - if m.Type.Name == listType { - return "list" + if m.Type.Name == listMeta { + isList = true + // stop iterating, if it's a list then it's not an object + break + } else if m.Type.Name == typeMeta { + isObject = true + // keep iterating, maybe it's a list } } + if isList { + return "list" + } + if isObject { + return "object" + } return "nested" } diff --git a/kubernetes-model-generator/openapi/schemas/openshift-authorization.json b/kubernetes-model-generator/openapi/schemas/openshift-authorization.json deleted file mode 100644 index 15bd01751e1..00000000000 --- a/kubernetes-model-generator/openapi/schemas/openshift-authorization.json +++ /dev/null @@ -1 +0,0 @@ -{"components":{"schemas":{"com.github.openshift.api.authorization.v1.ResourceAccessReviewResponse":{"properties":{"apiVersion":{"type":"string"},"evalutionError":{"type":"string"},"groups":{"items":{"type":"string"},"type":"array"},"kind":{"type":"string"},"namespace":{"type":"string"},"users":{"items":{"type":"string"},"type":"array"}},"type":"object"},"com.github.openshift.api.authorization.v1.SubjectAccessReviewResponse":{"properties":{"allowed":{"type":"boolean"},"apiVersion":{"type":"string"},"evaluationError":{"type":"string"},"kind":{"type":"string"},"namespace":{"type":"string"},"reason":{"type":"string"}},"type":"object"}}},"info":{"title":"openshift-authorization","version":"0.0.0"},"openapi":"3.0.0","paths":{}} \ No newline at end of file diff --git a/kubernetes-model-generator/openapi/schemas/openshift-generated.json b/kubernetes-model-generator/openapi/schemas/openshift-generated.json index 32a3f31bceb..698fb904030 100644 --- a/kubernetes-model-generator/openapi/schemas/openshift-generated.json +++ b/kubernetes-model-generator/openapi/schemas/openshift-generated.json @@ -767,7 +767,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "", "Version": "v1", "Kind": "Binding", @@ -4417,7 +4417,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "", "Version": "v1", "Kind": "NodeProxyOptions", @@ -5764,7 +5764,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "", "Version": "v1", "Kind": "PodAttachOptions", @@ -5922,7 +5922,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "", "Version": "v1", "Kind": "PodExecOptions", @@ -6036,7 +6036,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "", "Version": "v1", "Kind": "PodLogOptions", @@ -6088,7 +6088,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "", "Version": "v1", "Kind": "PodPortForwardOptions", @@ -6113,7 +6113,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "", "Version": "v1", "Kind": "PodProxyOptions", @@ -6770,7 +6770,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "", "Version": "v1", "Kind": "PodStatusResult", @@ -7296,7 +7296,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "", "Version": "v1", "Kind": "RangeAllocation", @@ -8311,7 +8311,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "", "Version": "v1", "Kind": "SerializedReference", @@ -8579,7 +8579,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "", "Version": "v1", "Kind": "ServiceProxyOptions", @@ -10292,7 +10292,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "meta.k8s.io", "Version": "v1", "Kind": "APIGroup", @@ -10325,7 +10325,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "meta.k8s.io", "Version": "v1", "Kind": "APIGroupList", @@ -10442,7 +10442,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "meta.k8s.io", "Version": "v1", "Kind": "APIResourceList", @@ -10485,7 +10485,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "meta.k8s.io", "Version": "v1", "Kind": "APIVersions", @@ -10529,7 +10529,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "meta.k8s.io", "Version": "v1", "Kind": "ApplyOptions", @@ -10617,7 +10617,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "meta.k8s.io", "Version": "v1", "Kind": "CreateOptions", @@ -10664,7 +10664,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "meta.k8s.io", "Version": "v1", "Kind": "DeleteOptions", @@ -10711,7 +10711,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "meta.k8s.io", "Version": "v1", "Kind": "GetOptions", @@ -11095,7 +11095,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "meta.k8s.io", "Version": "v1", "Kind": "ListOptions", @@ -11327,7 +11327,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "meta.k8s.io", "Version": "v1", "Kind": "PartialObjectMetadata", @@ -11417,7 +11417,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "meta.k8s.io", "Version": "v1", "Kind": "PatchOptions", @@ -11725,7 +11725,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "meta.k8s.io", "Version": "v1", "Kind": "TableOptions", @@ -11898,7 +11898,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "meta.k8s.io", "Version": "v1", "Kind": "UpdateOptions", @@ -12516,7 +12516,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "apps.openshift.io", "Version": "v1", "Kind": "DeploymentConfigRollback", @@ -12754,7 +12754,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "apps.openshift.io", "Version": "v1", "Kind": "DeploymentLog", @@ -12819,7 +12819,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "apps.openshift.io", "Version": "v1", "Kind": "DeploymentLogOptions", @@ -12868,7 +12868,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "apps.openshift.io", "Version": "v1", "Kind": "DeploymentRequest", @@ -13457,7 +13457,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "authorization.openshift.io", "Version": "v1", "Kind": "IsPersonalSubjectAccessReview", @@ -13930,7 +13930,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "authorization.openshift.io", "Version": "v1", "Kind": "ResourceAccessReviewResponse", @@ -14461,7 +14461,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "authorization.openshift.io", "Version": "v1", "Kind": "SubjectAccessReviewResponse", @@ -14658,7 +14658,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "build.openshift.io", "Version": "v1", "Kind": "BinaryBuildRequestOptions", @@ -15029,7 +15029,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "build.openshift.io", "Version": "v1", "Kind": "BuildLog", @@ -15098,7 +15098,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "build.openshift.io", "Version": "v1", "Kind": "BuildLogOptions", @@ -15231,7 +15231,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "build.openshift.io", "Version": "v1", "Kind": "BuildRequest", @@ -24756,7 +24756,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "config.openshift.io", "Version": "v1", "Kind": "TestReporting", @@ -27724,7 +27724,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "console.openshift.io", "Version": "v1", "Kind": "ConsoleYAMLSampleSpec", @@ -29119,7 +29119,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "image.openshift.io", "Version": "v1", "Kind": "ImageStreamLayers", @@ -30395,7 +30395,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "kubecontrolplane.config.openshift.io", "Version": "v1", "Kind": "KubeAPIServerConfig", @@ -30491,7 +30491,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "kubecontrolplane.config.openshift.io", "Version": "v1", "Kind": "KubeControllerManagerConfig", @@ -30935,7 +30935,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "legacy.config.openshift.io", "Version": "v1", "Kind": "AllowAllPasswordIdentityProvider", @@ -31120,7 +31120,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "legacy.config.openshift.io", "Version": "v1", "Kind": "BasicAuthPasswordIdentityProvider", @@ -31194,7 +31194,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "legacy.config.openshift.io", "Version": "v1", "Kind": "BuildDefaultsConfig", @@ -31255,7 +31255,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "legacy.config.openshift.io", "Version": "v1", "Kind": "BuildOverridesConfig", @@ -31481,7 +31481,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "legacy.config.openshift.io", "Version": "v1", "Kind": "DefaultAdmissionConfig", @@ -31502,7 +31502,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "legacy.config.openshift.io", "Version": "v1", "Kind": "DenyAllPasswordIdentityProvider", @@ -31726,7 +31726,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "legacy.config.openshift.io", "Version": "v1", "Kind": "GitHubIdentityProvider", @@ -31777,7 +31777,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "legacy.config.openshift.io", "Version": "v1", "Kind": "GitLabIdentityProvider", @@ -31818,7 +31818,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "legacy.config.openshift.io", "Version": "v1", "Kind": "GoogleIdentityProvider", @@ -31901,7 +31901,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "legacy.config.openshift.io", "Version": "v1", "Kind": "HTPasswdPasswordIdentityProvider", @@ -32221,7 +32221,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "legacy.config.openshift.io", "Version": "v1", "Kind": "KeystonePasswordIdentityProvider", @@ -32486,7 +32486,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "legacy.config.openshift.io", "Version": "v1", "Kind": "LDAPPasswordIdentityProvider", @@ -32613,7 +32613,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "legacy.config.openshift.io", "Version": "v1", "Kind": "LDAPSyncConfig", @@ -32882,7 +32882,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "legacy.config.openshift.io", "Version": "v1", "Kind": "MasterConfig", @@ -33213,7 +33213,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "legacy.config.openshift.io", "Version": "v1", "Kind": "NodeConfig", @@ -33492,7 +33492,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "legacy.config.openshift.io", "Version": "v1", "Kind": "OpenIDIdentityProvider", @@ -33897,7 +33897,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "legacy.config.openshift.io", "Version": "v1", "Kind": "RequestHeaderIdentityProvider", @@ -34182,7 +34182,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "legacy.config.openshift.io", "Version": "v1", "Kind": "SessionSecrets", @@ -34684,7 +34684,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "machine.openshift.io", "Version": "v1", "Kind": "AlibabaCloudMachineProviderConfig", @@ -34762,7 +34762,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "machine.openshift.io", "Version": "v1", "Kind": "AlibabaCloudMachineProviderStatus", @@ -35502,7 +35502,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "machine.openshift.io", "Version": "v1", "Kind": "NutanixMachineProviderConfig", @@ -35535,7 +35535,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "machine.openshift.io", "Version": "v1", "Kind": "NutanixMachineProviderStatus", @@ -35831,7 +35831,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "machine.openshift.io", "Version": "v1", "Kind": "PowerVSMachineProviderConfig", @@ -35878,7 +35878,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "machine.openshift.io", "Version": "v1", "Kind": "PowerVSMachineProviderStatus", @@ -36453,7 +36453,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "machine.openshift.io", "Version": "v1alpha1", "Kind": "OpenstackProviderSpec", @@ -36943,7 +36943,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "machine.openshift.io", "Version": "v1beta1", "Kind": "AWSMachineProviderConfig", @@ -37015,7 +37015,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "machine.openshift.io", "Version": "v1beta1", "Kind": "AWSMachineProviderStatus", @@ -37309,7 +37309,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "machine.openshift.io", "Version": "v1beta1", "Kind": "AzureMachineProviderSpec", @@ -37350,7 +37350,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "machine.openshift.io", "Version": "v1beta1", "Kind": "AzureMachineProviderStatus", @@ -37927,7 +37927,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "machine.openshift.io", "Version": "v1beta1", "Kind": "GCPMachineProviderSpec", @@ -37968,7 +37968,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "machine.openshift.io", "Version": "v1beta1", "Kind": "GCPMachineProviderStatus", @@ -39382,7 +39382,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "machine.openshift.io", "Version": "v1beta1", "Kind": "VSphereMachineProviderSpec", @@ -39423,7 +39423,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "machine.openshift.io", "Version": "v1beta1", "Kind": "VSphereMachineProviderStatus", @@ -41614,7 +41614,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "network.operator.openshift.io", "Version": "v1", "Kind": "EgressRouter", @@ -42126,7 +42126,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "oauth.openshift.io", "Version": "v1", "Kind": "OAuthRedirectReference", @@ -42418,7 +42418,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "openshiftcontrolplane.config.openshift.io", "Version": "v1", "Kind": "BuildDefaultsConfig", @@ -42475,7 +42475,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "openshiftcontrolplane.config.openshift.io", "Version": "v1", "Kind": "BuildOverridesConfig", @@ -42946,7 +42946,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "openshiftcontrolplane.config.openshift.io", "Version": "v1", "Kind": "OpenShiftAPIServerConfig", @@ -43053,7 +43053,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "openshiftcontrolplane.config.openshift.io", "Version": "v1", "Kind": "OpenShiftControllerManagerConfig", @@ -48412,7 +48412,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "operator.openshift.io", "Version": "v1", "Kind": "MyOperatorResource", @@ -51659,7 +51659,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "operator.openshift.io", "Version": "v1alpha1", "Kind": "GenericOperatorConfig", @@ -52776,7 +52776,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "osin.config.openshift.io", "Version": "v1", "Kind": "AllowAllPasswordIdentityProvider", @@ -52823,7 +52823,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "osin.config.openshift.io", "Version": "v1", "Kind": "BasicAuthPasswordIdentityProvider", @@ -52844,7 +52844,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "osin.config.openshift.io", "Version": "v1", "Kind": "DenyAllPasswordIdentityProvider", @@ -52909,7 +52909,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "osin.config.openshift.io", "Version": "v1", "Kind": "GitHubIdentityProvider", @@ -52960,7 +52960,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "osin.config.openshift.io", "Version": "v1", "Kind": "GitLabIdentityProvider", @@ -53001,7 +53001,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "osin.config.openshift.io", "Version": "v1", "Kind": "GoogleIdentityProvider", @@ -53057,7 +53057,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "osin.config.openshift.io", "Version": "v1", "Kind": "HTPasswdPasswordIdentityProvider", @@ -53161,7 +53161,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "osin.config.openshift.io", "Version": "v1", "Kind": "KeystonePasswordIdentityProvider", @@ -53271,7 +53271,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "osin.config.openshift.io", "Version": "v1", "Kind": "LDAPPasswordIdentityProvider", @@ -53516,7 +53516,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "osin.config.openshift.io", "Version": "v1", "Kind": "OpenIDIdentityProvider", @@ -53616,7 +53616,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "osin.config.openshift.io", "Version": "v1", "Kind": "OsinServerConfig", @@ -53702,7 +53702,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "osin.config.openshift.io", "Version": "v1", "Kind": "RequestHeaderIdentityProvider", @@ -53795,7 +53795,7 @@ } }, "x-fabric8-info": { - "Type": "nested", + "Type": "object", "Group": "osin.config.openshift.io", "Version": "v1", "Kind": "SessionSecrets", diff --git a/kubernetes-model-generator/openapi/schemas/openshift-security.json b/kubernetes-model-generator/openapi/schemas/openshift-security.json deleted file mode 100644 index 2d740f1cdf1..00000000000 --- a/kubernetes-model-generator/openapi/schemas/openshift-security.json +++ /dev/null @@ -1 +0,0 @@ -{"components":{"schemas":{"com.github.openshift.api.security.v1.AllowedFlexVolume":{"properties":{"driver":{"type":"string"}},"type":"object"},"com.github.openshift.api.security.v1.FSGroupStrategyOptions":{"properties":{"ranges":{"items":{"$ref":"#/components/schemas/com.github.openshift.api.security.v1.IDRange"},"type":"array"},"type":{"type":"string"}},"type":"object"},"com.github.openshift.api.security.v1.IDRange":{"properties":{"max":{"format":"int64","type":"integer"},"min":{"format":"int64","type":"integer"}},"type":"object"},"com.github.openshift.api.security.v1.RunAsUserStrategyOptions":{"properties":{"type":{"type":"string"},"uid":{"format":"int64","type":"integer"},"uidRangeMax":{"format":"int64","type":"integer"},"uidRangeMin":{"format":"int64","type":"integer"}},"type":"object"},"com.github.openshift.api.security.v1.SELinuxContextStrategyOptions":{"properties":{"seLinuxOptions":{"$ref":"#/components/schemas/io.k8s.api.core.v1.SELinuxOptions"},"type":{"type":"string"}},"type":"object"},"com.github.openshift.api.security.v1.SecurityContextConstraints":{"properties":{"allowHostDirVolumePlugin":{"type":"boolean"},"allowHostIPC":{"type":"boolean"},"allowHostNetwork":{"type":"boolean"},"allowHostPID":{"type":"boolean"},"allowHostPorts":{"type":"boolean"},"allowPrivilegeEscalation":{"type":"boolean"},"allowPrivilegedContainer":{"type":"boolean"},"allowedCapabilities":{"items":{"type":"string"},"type":"array"},"allowedFlexVolumes":{"items":{"$ref":"#/components/schemas/com.github.openshift.api.security.v1.AllowedFlexVolume"},"type":"array"},"allowedUnsafeSysctls":{"items":{"type":"string"},"type":"array"},"apiVersion":{"type":"string"},"defaultAddCapabilities":{"items":{"type":"string"},"type":"array"},"defaultAllowPrivilegeEscalation":{"type":"boolean"},"forbiddenSysctls":{"items":{"type":"string"},"type":"array"},"fsGroup":{"$ref":"#/components/schemas/com.github.openshift.api.security.v1.FSGroupStrategyOptions"},"groups":{"items":{"type":"string"},"type":"array"},"kind":{"type":"string"},"metadata":{"$ref":"#/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta"},"priority":{"format":"int32","type":"integer"},"readOnlyRootFilesystem":{"type":"boolean"},"requiredDropCapabilities":{"items":{"type":"string"},"type":"array"},"runAsUser":{"$ref":"#/components/schemas/com.github.openshift.api.security.v1.RunAsUserStrategyOptions"},"seLinuxContext":{"$ref":"#/components/schemas/com.github.openshift.api.security.v1.SELinuxContextStrategyOptions"},"seccompProfiles":{"items":{"type":"string"},"type":"array"},"supplementalGroups":{"$ref":"#/components/schemas/com.github.openshift.api.security.v1.SupplementalGroupsStrategyOptions"},"users":{"items":{"type":"string"},"type":"array"},"volumes":{"items":{"type":"string"},"type":"array"}},"type":"object"},"com.github.openshift.api.security.v1.SecurityContextConstraintsList":{"properties":{"apiVersion":{"type":"string"},"items":{"items":{"$ref":"#/components/schemas/com.github.openshift.api.security.v1.SecurityContextConstraints"},"type":"array"},"kind":{"type":"string"},"metadata":{"$ref":"#/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta"}},"type":"object"},"com.github.openshift.api.security.v1.SupplementalGroupsStrategyOptions":{"properties":{"ranges":{"items":{"$ref":"#/components/schemas/com.github.openshift.api.security.v1.IDRange"},"type":"array"},"type":{"type":"string"}},"type":"object"},"io.k8s.api.core.v1.SELinuxOptions":{"properties":{"level":{"type":"string"},"role":{"type":"string"},"type":{"type":"string"},"user":{"type":"string"}},"type":"object"},"io.k8s.apimachinery.pkg.apis.meta.v1.FieldsV1":{"properties":{"-":{"type":"string"}},"type":"object"},"io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta":{"properties":{"continue":{"type":"string"},"remainingItemCount":{"format":"int64","type":"integer"},"resourceVersion":{"type":"string"},"selfLink":{"type":"string"}},"type":"object"},"io.k8s.apimachinery.pkg.apis.meta.v1.ManagedFieldsEntry":{"properties":{"apiVersion":{"type":"string"},"fieldsType":{"type":"string"},"fieldsV1":{"$ref":"#/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.FieldsV1"},"manager":{"type":"string"},"operation":{"type":"string"},"subresource":{"type":"string"},"time":{"$ref":"#/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.Time"}},"type":"object"},"io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta":{"properties":{"annotations":{"additionalProperties":{"type":"string"},"type":"object"},"creationTimestamp":{"$ref":"#/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.Time"},"deletionGracePeriodSeconds":{"format":"int64","type":"integer"},"deletionTimestamp":{"$ref":"#/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.Time"},"finalizers":{"items":{"type":"string"},"type":"array"},"generateName":{"type":"string"},"generation":{"format":"int64","type":"integer"},"labels":{"additionalProperties":{"type":"string"},"type":"object"},"managedFields":{"items":{"$ref":"#/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.ManagedFieldsEntry"},"type":"array"},"name":{"type":"string"},"namespace":{"type":"string"},"ownerReferences":{"items":{"$ref":"#/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.OwnerReference"},"type":"array"},"resourceVersion":{"type":"string"},"selfLink":{"type":"string"},"uid":{"type":"string"}},"type":"object"},"io.k8s.apimachinery.pkg.apis.meta.v1.OwnerReference":{"properties":{"apiVersion":{"type":"string"},"blockOwnerDeletion":{"type":"boolean"},"controller":{"type":"boolean"},"kind":{"type":"string"},"name":{"type":"string"},"uid":{"type":"string"}},"type":"object"},"io.k8s.apimachinery.pkg.apis.meta.v1.Time":{"properties":{"Time":{"type":"string"}},"type":"object"}}},"info":{"title":"openshift-security","version":"0.0.0"},"openapi":"3.0.0","paths":{"/apis/security.openshift.io/v1/securitycontextconstraints":{"get":{"responses":{"200":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/com.github.openshift.api.security.v1.SecurityContextConstraintsList"}}},"description":"OK"},"default":{"description":""}},"x-kubernetes-group-version-kind":{"group":"security.openshift.io","kind":"SecurityContextConstraintsList","version":"v1"}}},"/apis/security.openshift.io/v1/securitycontextconstraints/{name}":{"get":{"parameters":[{"in":"path","name":"name","required":true}],"responses":{"200":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/com.github.openshift.api.security.v1.SecurityContextConstraints"}}},"description":"OK"},"default":{"description":""}},"x-kubernetes-group-version-kind":{"group":"security.openshift.io","kind":"SecurityContextConstraints","version":"v1"}}}}} \ No newline at end of file diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/TestReporting.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/TestReporting.java index 62f4ec56de0..fb2fa2eb765 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/TestReporting.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/TestReporting.java @@ -13,17 +13,22 @@ import com.fasterxml.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.KubernetesResource; 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; @@ -54,14 +59,29 @@ @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("config.openshift.io") @Generated("jsonschema2pojo") -public class TestReporting implements Editable , KubernetesResource +public class TestReporting implements Editable , HasMetadata, Namespaced { + /** + * + * (Required) + * + */ @JsonProperty("apiVersion") - private String apiVersion; + private String apiVersion = "config.openshift.io/v1"; + /** + * + * (Required) + * + */ @JsonProperty("kind") - private String kind; + private String kind = "TestReporting"; @JsonProperty("metadata") private ObjectMeta metadata; @JsonProperty("spec") @@ -87,21 +107,41 @@ public TestReporting(String apiVersion, String kind, ObjectMeta metadata, TestRe 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; diff --git a/kubernetes-model-generator/openshift-model/pom.xml b/kubernetes-model-generator/openshift-model/pom.xml index 5d34821d08f..c98ffcf9efa 100644 --- a/kubernetes-model-generator/openshift-model/pom.xml +++ b/kubernetes-model-generator/openshift-model/pom.xml @@ -47,6 +47,10 @@ io.fabric8 kubernetes-model-rbac + + io.fabric8 + openshift-model-config + org.assertj @@ -66,67 +70,27 @@ - ${openapi.schema.openshift-latest} - ${project.basedir}/../openapi/schemas/openshift-authorization.json - ${project.basedir}/../openapi/schemas/openshift-security.json + ${openapi.schema.openshift-generated} - io.fabric8.kubernetes.api.model - io.fabric8.openshift.api.model - io.fabric8.openshift.api.model - io.fabric8.openshift.api.model - io.fabric8.openshift.api.model - io.fabric8.openshift.api.model - io.fabric8.openshift.api.model - io.fabric8.openshift.api.model - io.fabric8.openshift.api.model - io.fabric8.openshift.api.model - io.fabric8.openshift.api.model - io.fabric8.openshift.api.model - io.fabric8.openshift.api.model - io.fabric8.openshift.api.model - io.fabric8.openshift.api.model - io.fabric8.openshift.api.model - ^com\.github\.openshift\.api\..*$ + ^io\.openshift\.apps\..*$ ^io\.openshift\.authorization\..*$ + ^io\.openshift\.build\..*$ + ^io\.openshift\.image\..*$ + ^io\.openshift\.oauth\..*$ + ^io\.openshift\.project\..*$ ^io\.openshift\.quota\..*$ + ^io\.openshift\.route\..*$ ^io\.openshift\.security\..*$ + ^io\.openshift\.template\..*$ + ^io\.openshift\.user\..*$ - ^com\.github\.openshift\.api\.image\.v1\.SecretList$ + ^io\.openshift\.build\.v1\.BinaryBuildRequestOptions$ + ^io\.openshift\.image\.v1\.SecretList$ - - - #/components/schemas/io.k8s.api.core.v1.ConfigMapVolumeSource_v2 - io.fabric8.kubernetes.api.model.ConfigMapVolumeSource - - - #/components/schemas/io.k8s.api.core.v1.LocalObjectReference_v2 - io.fabric8.kubernetes.api.model.LocalObjectReference - - - #/components/schemas/io.k8s.api.core.v1.ResourceQuotaSpec_v2 - io.fabric8.kubernetes.api.model.ResourceQuotaSpec - - - #/components/schemas/io.k8s.api.core.v1.SecretVolumeSource_v2 - io.fabric8.kubernetes.api.model.SecretVolumeSource - - - #/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.Status_v5 - io.fabric8.kubernetes.api.model.Status - - - #/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.LabelSelector_v4 - io.fabric8.kubernetes.api.model.LabelSelector - - - #/components/schemas/io.k8s.api.rbac.v1.AggregationRule_v2 - io.fabric8.kubernetes.api.model.rbac.AggregationRule - - diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Action.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Action.java new file mode 100644 index 00000000000..ae5504021be --- /dev/null +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Action.java @@ -0,0 +1,222 @@ + +package io.fabric8.openshift.api.model; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "content", + "isNonResourceURL", + "namespace", + "path", + "resource", + "resourceAPIGroup", + "resourceAPIVersion", + "resourceName", + "verb" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Generated("jsonschema2pojo") +public class Action implements Editable , KubernetesResource +{ + + @JsonProperty("content") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + private Object content; + @JsonProperty("isNonResourceURL") + private Boolean isNonResourceURL; + @JsonProperty("namespace") + private String namespace; + @JsonProperty("path") + private String path; + @JsonProperty("resource") + private String resource; + @JsonProperty("resourceAPIGroup") + private String resourceAPIGroup; + @JsonProperty("resourceAPIVersion") + private String resourceAPIVersion; + @JsonProperty("resourceName") + private String resourceName; + @JsonProperty("verb") + private String verb; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public Action() { + } + + public Action(Object content, Boolean isNonResourceURL, String namespace, String path, String resource, String resourceAPIGroup, String resourceAPIVersion, String resourceName, String verb) { + super(); + this.content = content; + this.isNonResourceURL = isNonResourceURL; + this.namespace = namespace; + this.path = path; + this.resource = resource; + this.resourceAPIGroup = resourceAPIGroup; + this.resourceAPIVersion = resourceAPIVersion; + this.resourceName = resourceName; + this.verb = verb; + } + + @JsonProperty("content") + public Object getContent() { + return content; + } + + @JsonProperty("content") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + public void setContent(Object content) { + this.content = content; + } + + @JsonProperty("isNonResourceURL") + public Boolean getIsNonResourceURL() { + return isNonResourceURL; + } + + @JsonProperty("isNonResourceURL") + public void setIsNonResourceURL(Boolean isNonResourceURL) { + this.isNonResourceURL = isNonResourceURL; + } + + @JsonProperty("namespace") + public String getNamespace() { + return namespace; + } + + @JsonProperty("namespace") + public void setNamespace(String namespace) { + this.namespace = namespace; + } + + @JsonProperty("path") + public String getPath() { + return path; + } + + @JsonProperty("path") + public void setPath(String path) { + this.path = path; + } + + @JsonProperty("resource") + public String getResource() { + return resource; + } + + @JsonProperty("resource") + public void setResource(String resource) { + this.resource = resource; + } + + @JsonProperty("resourceAPIGroup") + public String getResourceAPIGroup() { + return resourceAPIGroup; + } + + @JsonProperty("resourceAPIGroup") + public void setResourceAPIGroup(String resourceAPIGroup) { + this.resourceAPIGroup = resourceAPIGroup; + } + + @JsonProperty("resourceAPIVersion") + public String getResourceAPIVersion() { + return resourceAPIVersion; + } + + @JsonProperty("resourceAPIVersion") + public void setResourceAPIVersion(String resourceAPIVersion) { + this.resourceAPIVersion = resourceAPIVersion; + } + + @JsonProperty("resourceName") + public String getResourceName() { + return resourceName; + } + + @JsonProperty("resourceName") + public void setResourceName(String resourceName) { + this.resourceName = resourceName; + } + + @JsonProperty("verb") + public String getVerb() { + return verb; + } + + @JsonProperty("verb") + public void setVerb(String verb) { + this.verb = verb; + } + + @JsonIgnore + public ActionBuilder edit() { + return new ActionBuilder(this); + } + + @JsonIgnore + public ActionBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildLogOptions.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildLogOptions.java new file mode 100644 index 00000000000..0636c73680d --- /dev/null +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildLogOptions.java @@ -0,0 +1,316 @@ + +package io.fabric8.openshift.api.model; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +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", + "container", + "follow", + "insecureSkipTLSVerifyBackend", + "limitBytes", + "nowait", + "previous", + "sinceSeconds", + "sinceTime", + "tailLines", + "timestamps", + "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) +}) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) +}) +@Version("v1") +@Group("build.openshift.io") +@Generated("jsonschema2pojo") +public class BuildLogOptions implements Editable , KubernetesResource, Namespaced +{ + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + private String apiVersion = "build.openshift.io/v1"; + @JsonProperty("container") + private String container; + @JsonProperty("follow") + private Boolean follow; + @JsonProperty("insecureSkipTLSVerifyBackend") + private Boolean insecureSkipTLSVerifyBackend; + /** + * + * (Required) + * + */ + @JsonProperty("kind") + private String kind = "BuildLogOptions"; + @JsonProperty("limitBytes") + private Long limitBytes; + @JsonProperty("nowait") + private Boolean nowait; + @JsonProperty("previous") + private Boolean previous; + @JsonProperty("sinceSeconds") + private Long sinceSeconds; + @JsonProperty("sinceTime") + private String sinceTime; + @JsonProperty("tailLines") + private Long tailLines; + @JsonProperty("timestamps") + private Boolean timestamps; + @JsonProperty("version") + private Long version; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public BuildLogOptions() { + } + + public BuildLogOptions(String apiVersion, String container, Boolean follow, Boolean insecureSkipTLSVerifyBackend, String kind, Long limitBytes, Boolean nowait, Boolean previous, Long sinceSeconds, String sinceTime, Long tailLines, Boolean timestamps, Long version) { + super(); + this.apiVersion = apiVersion; + this.container = container; + this.follow = follow; + this.insecureSkipTLSVerifyBackend = insecureSkipTLSVerifyBackend; + this.kind = kind; + this.limitBytes = limitBytes; + this.nowait = nowait; + this.previous = previous; + this.sinceSeconds = sinceSeconds; + this.sinceTime = sinceTime; + this.tailLines = tailLines; + this.timestamps = timestamps; + this.version = version; + } + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + public String getApiVersion() { + return apiVersion; + } + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + public void setApiVersion(String apiVersion) { + this.apiVersion = apiVersion; + } + + @JsonProperty("container") + public String getContainer() { + return container; + } + + @JsonProperty("container") + public void setContainer(String container) { + this.container = container; + } + + @JsonProperty("follow") + public Boolean getFollow() { + return follow; + } + + @JsonProperty("follow") + public void setFollow(Boolean follow) { + this.follow = follow; + } + + @JsonProperty("insecureSkipTLSVerifyBackend") + public Boolean getInsecureSkipTLSVerifyBackend() { + return insecureSkipTLSVerifyBackend; + } + + @JsonProperty("insecureSkipTLSVerifyBackend") + public void setInsecureSkipTLSVerifyBackend(Boolean insecureSkipTLSVerifyBackend) { + this.insecureSkipTLSVerifyBackend = insecureSkipTLSVerifyBackend; + } + + /** + * + * (Required) + * + */ + @JsonProperty("kind") + public String getKind() { + return kind; + } + + /** + * + * (Required) + * + */ + @JsonProperty("kind") + public void setKind(String kind) { + this.kind = kind; + } + + @JsonProperty("limitBytes") + public Long getLimitBytes() { + return limitBytes; + } + + @JsonProperty("limitBytes") + public void setLimitBytes(Long limitBytes) { + this.limitBytes = limitBytes; + } + + @JsonProperty("nowait") + public Boolean getNowait() { + return nowait; + } + + @JsonProperty("nowait") + public void setNowait(Boolean nowait) { + this.nowait = nowait; + } + + @JsonProperty("previous") + public Boolean getPrevious() { + return previous; + } + + @JsonProperty("previous") + public void setPrevious(Boolean previous) { + this.previous = previous; + } + + @JsonProperty("sinceSeconds") + public Long getSinceSeconds() { + return sinceSeconds; + } + + @JsonProperty("sinceSeconds") + public void setSinceSeconds(Long sinceSeconds) { + this.sinceSeconds = sinceSeconds; + } + + @JsonProperty("sinceTime") + public String getSinceTime() { + return sinceTime; + } + + @JsonProperty("sinceTime") + public void setSinceTime(String sinceTime) { + this.sinceTime = sinceTime; + } + + @JsonProperty("tailLines") + public Long getTailLines() { + return tailLines; + } + + @JsonProperty("tailLines") + public void setTailLines(Long tailLines) { + this.tailLines = tailLines; + } + + @JsonProperty("timestamps") + public Boolean getTimestamps() { + return timestamps; + } + + @JsonProperty("timestamps") + public void setTimestamps(Boolean timestamps) { + this.timestamps = timestamps; + } + + @JsonProperty("version") + public Long getVersion() { + return version; + } + + @JsonProperty("version") + public void setVersion(Long version) { + this.version = version; + } + + @JsonIgnore + public BuildLogOptionsBuilder edit() { + return new BuildLogOptionsBuilder(this); + } + + @JsonIgnore + public BuildLogOptionsBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterResourceQuotaStatus.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterResourceQuotaStatus.java index baf1ef2fd44..974ea50f57c 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterResourceQuotaStatus.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterResourceQuotaStatus.java @@ -1,7 +1,9 @@ package io.fabric8.openshift.api.model; +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; @@ -21,6 +23,7 @@ import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceQuotaStatus; import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; @@ -56,10 +59,10 @@ public class ClusterResourceQuotaStatus implements Editable namespaces = new ArrayList<>(); @JsonProperty("total") - private ClusterResourceQuotaStatusTotal total; + private ResourceQuotaStatus total; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -70,30 +73,30 @@ public class ClusterResourceQuotaStatus implements Editable namespaces, ResourceQuotaStatus total) { super(); this.namespaces = namespaces; this.total = total; } @JsonProperty("namespaces") - public Object getNamespaces() { + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getNamespaces() { return namespaces; } @JsonProperty("namespaces") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - public void setNamespaces(Object namespaces) { + public void setNamespaces(List namespaces) { this.namespaces = namespaces; } @JsonProperty("total") - public ClusterResourceQuotaStatusTotal getTotal() { + public ResourceQuotaStatus getTotal() { return total; } @JsonProperty("total") - public void setTotal(ClusterResourceQuotaStatusTotal total) { + public void setTotal(ResourceQuotaStatus total) { this.total = total; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/CommonSpec.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/CommonSpec.java new file mode 100644 index 00000000000..73840542204 --- /dev/null +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/CommonSpec.java @@ -0,0 +1,236 @@ + +package io.fabric8.openshift.api.model; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "completionDeadlineSeconds", + "mountTrustedCA", + "nodeSelector", + "output", + "postCommit", + "resources", + "revision", + "serviceAccount", + "source", + "strategy" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Generated("jsonschema2pojo") +public class CommonSpec implements Editable , KubernetesResource +{ + + @JsonProperty("completionDeadlineSeconds") + private Long completionDeadlineSeconds; + @JsonProperty("mountTrustedCA") + private Boolean mountTrustedCA; + @JsonProperty("nodeSelector") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private Map nodeSelector = new LinkedHashMap<>(); + @JsonProperty("output") + private BuildOutput output; + @JsonProperty("postCommit") + private BuildPostCommitSpec postCommit; + @JsonProperty("resources") + private ResourceRequirements resources; + @JsonProperty("revision") + private SourceRevision revision; + @JsonProperty("serviceAccount") + private String serviceAccount; + @JsonProperty("source") + private BuildSource source; + @JsonProperty("strategy") + private BuildStrategy strategy; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public CommonSpec() { + } + + public CommonSpec(Long completionDeadlineSeconds, Boolean mountTrustedCA, Map nodeSelector, BuildOutput output, BuildPostCommitSpec postCommit, ResourceRequirements resources, SourceRevision revision, String serviceAccount, BuildSource source, BuildStrategy strategy) { + super(); + this.completionDeadlineSeconds = completionDeadlineSeconds; + this.mountTrustedCA = mountTrustedCA; + this.nodeSelector = nodeSelector; + this.output = output; + this.postCommit = postCommit; + this.resources = resources; + this.revision = revision; + this.serviceAccount = serviceAccount; + this.source = source; + this.strategy = strategy; + } + + @JsonProperty("completionDeadlineSeconds") + public Long getCompletionDeadlineSeconds() { + return completionDeadlineSeconds; + } + + @JsonProperty("completionDeadlineSeconds") + public void setCompletionDeadlineSeconds(Long completionDeadlineSeconds) { + this.completionDeadlineSeconds = completionDeadlineSeconds; + } + + @JsonProperty("mountTrustedCA") + public Boolean getMountTrustedCA() { + return mountTrustedCA; + } + + @JsonProperty("mountTrustedCA") + public void setMountTrustedCA(Boolean mountTrustedCA) { + this.mountTrustedCA = mountTrustedCA; + } + + @JsonProperty("nodeSelector") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public Map getNodeSelector() { + return nodeSelector; + } + + @JsonProperty("nodeSelector") + public void setNodeSelector(Map nodeSelector) { + this.nodeSelector = nodeSelector; + } + + @JsonProperty("output") + public BuildOutput getOutput() { + return output; + } + + @JsonProperty("output") + public void setOutput(BuildOutput output) { + this.output = output; + } + + @JsonProperty("postCommit") + public BuildPostCommitSpec getPostCommit() { + return postCommit; + } + + @JsonProperty("postCommit") + public void setPostCommit(BuildPostCommitSpec postCommit) { + this.postCommit = postCommit; + } + + @JsonProperty("resources") + public ResourceRequirements getResources() { + return resources; + } + + @JsonProperty("resources") + public void setResources(ResourceRequirements resources) { + this.resources = resources; + } + + @JsonProperty("revision") + public SourceRevision getRevision() { + return revision; + } + + @JsonProperty("revision") + public void setRevision(SourceRevision revision) { + this.revision = revision; + } + + @JsonProperty("serviceAccount") + public String getServiceAccount() { + return serviceAccount; + } + + @JsonProperty("serviceAccount") + public void setServiceAccount(String serviceAccount) { + this.serviceAccount = serviceAccount; + } + + @JsonProperty("source") + public BuildSource getSource() { + return source; + } + + @JsonProperty("source") + public void setSource(BuildSource source) { + this.source = source; + } + + @JsonProperty("strategy") + public BuildStrategy getStrategy() { + return strategy; + } + + @JsonProperty("strategy") + public void setStrategy(BuildStrategy strategy) { + this.strategy = strategy; + } + + @JsonIgnore + public CommonSpecBuilder edit() { + return new CommonSpecBuilder(this); + } + + @JsonIgnore + public CommonSpecBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/CommonWebHookCause.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/CommonWebHookCause.java new file mode 100644 index 00000000000..95d1845ae09 --- /dev/null +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/CommonWebHookCause.java @@ -0,0 +1,122 @@ + +package io.fabric8.openshift.api.model; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "revision", + "secret" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Generated("jsonschema2pojo") +public class CommonWebHookCause implements Editable , KubernetesResource +{ + + @JsonProperty("revision") + private SourceRevision revision; + @JsonProperty("secret") + private String secret; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public CommonWebHookCause() { + } + + public CommonWebHookCause(SourceRevision revision, String secret) { + super(); + this.revision = revision; + this.secret = secret; + } + + @JsonProperty("revision") + public SourceRevision getRevision() { + return revision; + } + + @JsonProperty("revision") + public void setRevision(SourceRevision revision) { + this.revision = revision; + } + + @JsonProperty("secret") + public String getSecret() { + return secret; + } + + @JsonProperty("secret") + public void setSecret(String secret) { + this.secret = secret; + } + + @JsonIgnore + public CommonWebHookCauseBuilder edit() { + return new CommonWebHookCauseBuilder(this); + } + + @JsonIgnore + public CommonWebHookCauseBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DeploymentLogOptions.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DeploymentLogOptions.java new file mode 100644 index 00000000000..708ea2152fd --- /dev/null +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DeploymentLogOptions.java @@ -0,0 +1,302 @@ + +package io.fabric8.openshift.api.model; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +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", + "container", + "follow", + "limitBytes", + "nowait", + "previous", + "sinceSeconds", + "sinceTime", + "tailLines", + "timestamps", + "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) +}) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) +}) +@Version("v1") +@Group("apps.openshift.io") +@Generated("jsonschema2pojo") +public class DeploymentLogOptions implements Editable , KubernetesResource, Namespaced +{ + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + private String apiVersion = "apps.openshift.io/v1"; + @JsonProperty("container") + private String container; + @JsonProperty("follow") + private Boolean follow; + /** + * + * (Required) + * + */ + @JsonProperty("kind") + private String kind = "DeploymentLogOptions"; + @JsonProperty("limitBytes") + private Long limitBytes; + @JsonProperty("nowait") + private Boolean nowait; + @JsonProperty("previous") + private Boolean previous; + @JsonProperty("sinceSeconds") + private Long sinceSeconds; + @JsonProperty("sinceTime") + private String sinceTime; + @JsonProperty("tailLines") + private Long tailLines; + @JsonProperty("timestamps") + private Boolean timestamps; + @JsonProperty("version") + private Long version; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public DeploymentLogOptions() { + } + + public DeploymentLogOptions(String apiVersion, String container, Boolean follow, String kind, Long limitBytes, Boolean nowait, Boolean previous, Long sinceSeconds, String sinceTime, Long tailLines, Boolean timestamps, Long version) { + super(); + this.apiVersion = apiVersion; + this.container = container; + this.follow = follow; + this.kind = kind; + this.limitBytes = limitBytes; + this.nowait = nowait; + this.previous = previous; + this.sinceSeconds = sinceSeconds; + this.sinceTime = sinceTime; + this.tailLines = tailLines; + this.timestamps = timestamps; + this.version = version; + } + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + public String getApiVersion() { + return apiVersion; + } + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + public void setApiVersion(String apiVersion) { + this.apiVersion = apiVersion; + } + + @JsonProperty("container") + public String getContainer() { + return container; + } + + @JsonProperty("container") + public void setContainer(String container) { + this.container = container; + } + + @JsonProperty("follow") + public Boolean getFollow() { + return follow; + } + + @JsonProperty("follow") + public void setFollow(Boolean follow) { + this.follow = follow; + } + + /** + * + * (Required) + * + */ + @JsonProperty("kind") + public String getKind() { + return kind; + } + + /** + * + * (Required) + * + */ + @JsonProperty("kind") + public void setKind(String kind) { + this.kind = kind; + } + + @JsonProperty("limitBytes") + public Long getLimitBytes() { + return limitBytes; + } + + @JsonProperty("limitBytes") + public void setLimitBytes(Long limitBytes) { + this.limitBytes = limitBytes; + } + + @JsonProperty("nowait") + public Boolean getNowait() { + return nowait; + } + + @JsonProperty("nowait") + public void setNowait(Boolean nowait) { + this.nowait = nowait; + } + + @JsonProperty("previous") + public Boolean getPrevious() { + return previous; + } + + @JsonProperty("previous") + public void setPrevious(Boolean previous) { + this.previous = previous; + } + + @JsonProperty("sinceSeconds") + public Long getSinceSeconds() { + return sinceSeconds; + } + + @JsonProperty("sinceSeconds") + public void setSinceSeconds(Long sinceSeconds) { + this.sinceSeconds = sinceSeconds; + } + + @JsonProperty("sinceTime") + public String getSinceTime() { + return sinceTime; + } + + @JsonProperty("sinceTime") + public void setSinceTime(String sinceTime) { + this.sinceTime = sinceTime; + } + + @JsonProperty("tailLines") + public Long getTailLines() { + return tailLines; + } + + @JsonProperty("tailLines") + public void setTailLines(Long tailLines) { + this.tailLines = tailLines; + } + + @JsonProperty("timestamps") + public Boolean getTimestamps() { + return timestamps; + } + + @JsonProperty("timestamps") + public void setTimestamps(Boolean timestamps) { + this.timestamps = timestamps; + } + + @JsonProperty("version") + public Long getVersion() { + return version; + } + + @JsonProperty("version") + public void setVersion(Long version) { + this.version = version; + } + + @JsonIgnore + public DeploymentLogOptionsBuilder edit() { + return new DeploymentLogOptionsBuilder(this); + } + + @JsonIgnore + public DeploymentLogOptionsBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DockerImageReference.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DockerImageReference.java new file mode 100644 index 00000000000..c31b0a2b67f --- /dev/null +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DockerImageReference.java @@ -0,0 +1,164 @@ + +package io.fabric8.openshift.api.model; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "ID", + "Name", + "Namespace", + "Registry", + "Tag" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Generated("jsonschema2pojo") +public class DockerImageReference implements Editable , KubernetesResource +{ + + @JsonProperty("ID") + private String iD; + @JsonProperty("Name") + private String name; + @JsonProperty("Namespace") + private String namespace; + @JsonProperty("Registry") + private String registry; + @JsonProperty("Tag") + private String tag; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public DockerImageReference() { + } + + public DockerImageReference(String iD, String name, String namespace, String registry, String tag) { + super(); + this.iD = iD; + this.name = name; + this.namespace = namespace; + this.registry = registry; + this.tag = tag; + } + + @JsonProperty("ID") + public String getID() { + return iD; + } + + @JsonProperty("ID") + public void setID(String iD) { + this.iD = iD; + } + + @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("Registry") + public String getRegistry() { + return registry; + } + + @JsonProperty("Registry") + public void setRegistry(String registry) { + this.registry = registry; + } + + @JsonProperty("Tag") + public String getTag() { + return tag; + } + + @JsonProperty("Tag") + public void setTag(String tag) { + this.tag = tag; + } + + @JsonIgnore + public DockerImageReferenceBuilder edit() { + return new DockerImageReferenceBuilder(this); + } + + @JsonIgnore + public DockerImageReferenceBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterResourceQuotaSpecQuota.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/GenericWebHookEvent.java similarity index 62% rename from kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterResourceQuotaSpecQuota.java rename to kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/GenericWebHookEvent.java index 6271e3c3156..2b5a8b48253 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterResourceQuotaSpecQuota.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/GenericWebHookEvent.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.EnvVar; import io.fabric8.kubernetes.api.model.IntOrString; import io.fabric8.kubernetes.api.model.KubernetesResource; import io.fabric8.kubernetes.api.model.LabelSelector; @@ -33,9 +34,10 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "hard", - "scopeSelector", - "scopes" + "dockerStrategyOptions", + "env", + "git", + "type" }) @ToString @EqualsAndHashCode @@ -55,18 +57,18 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ClusterResourceQuotaSpecQuota implements Editable , KubernetesResource +public class GenericWebHookEvent implements Editable , KubernetesResource { - @JsonProperty("hard") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializerForMap.class) + @JsonProperty("dockerStrategyOptions") + private DockerStrategyOptions dockerStrategyOptions; + @JsonProperty("env") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Map hard = new LinkedHashMap<>(); - @JsonProperty("scopeSelector") - private ClusterResourceQuotaSpecQScopeSelector scopeSelector; - @JsonProperty("scopes") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List scopes = new ArrayList<>(); + private List env = new ArrayList<>(); + @JsonProperty("git") + private GitInfo git; + @JsonProperty("type") + private String type; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -74,56 +76,65 @@ public class ClusterResourceQuotaSpecQuota implements Editable hard, ClusterResourceQuotaSpecQScopeSelector scopeSelector, List scopes) { + public GenericWebHookEvent(DockerStrategyOptions dockerStrategyOptions, List env, GitInfo git, String type) { super(); - this.hard = hard; - this.scopeSelector = scopeSelector; - this.scopes = scopes; + this.dockerStrategyOptions = dockerStrategyOptions; + this.env = env; + this.git = git; + this.type = type; + } + + @JsonProperty("dockerStrategyOptions") + public DockerStrategyOptions getDockerStrategyOptions() { + return dockerStrategyOptions; } - @JsonProperty("hard") + @JsonProperty("dockerStrategyOptions") + public void setDockerStrategyOptions(DockerStrategyOptions dockerStrategyOptions) { + this.dockerStrategyOptions = dockerStrategyOptions; + } + + @JsonProperty("env") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public Map getHard() { - return hard; + public List getEnv() { + return env; } - @JsonProperty("hard") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializerForMap.class) - public void setHard(Map hard) { - this.hard = hard; + @JsonProperty("env") + public void setEnv(List env) { + this.env = env; } - @JsonProperty("scopeSelector") - public ClusterResourceQuotaSpecQScopeSelector getScopeSelector() { - return scopeSelector; + @JsonProperty("git") + public GitInfo getGit() { + return git; } - @JsonProperty("scopeSelector") - public void setScopeSelector(ClusterResourceQuotaSpecQScopeSelector scopeSelector) { - this.scopeSelector = scopeSelector; + @JsonProperty("git") + public void setGit(GitInfo git) { + this.git = git; } - @JsonProperty("scopes") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getScopes() { - return scopes; + @JsonProperty("type") + public String getType() { + return type; } - @JsonProperty("scopes") - public void setScopes(List scopes) { - this.scopes = scopes; + @JsonProperty("type") + public void setType(String type) { + this.type = type; } @JsonIgnore - public ClusterResourceQuotaSpecQuotaBuilder edit() { - return new ClusterResourceQuotaSpecQuotaBuilder(this); + public GenericWebHookEventBuilder edit() { + return new GenericWebHookEventBuilder(this); } @JsonIgnore - public ClusterResourceQuotaSpecQuotaBuilder toBuilder() { + public GenericWebHookEventBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/GitInfo.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/GitInfo.java new file mode 100644 index 00000000000..8ad5ea7a607 --- /dev/null +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/GitInfo.java @@ -0,0 +1,238 @@ + +package io.fabric8.openshift.api.model; + +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({ + "author", + "commit", + "committer", + "httpProxy", + "httpsProxy", + "message", + "noProxy", + "ref", + "refs", + "uri" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Generated("jsonschema2pojo") +public class GitInfo implements Editable , KubernetesResource +{ + + @JsonProperty("author") + private SourceControlUser author; + @JsonProperty("commit") + private String commit; + @JsonProperty("committer") + private SourceControlUser committer; + @JsonProperty("httpProxy") + private String httpProxy; + @JsonProperty("httpsProxy") + private String httpsProxy; + @JsonProperty("message") + private String message; + @JsonProperty("noProxy") + private String noProxy; + @JsonProperty("ref") + private String ref; + @JsonProperty("refs") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List refs = new ArrayList<>(); + @JsonProperty("uri") + private String uri; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public GitInfo() { + } + + public GitInfo(SourceControlUser author, String commit, SourceControlUser committer, String httpProxy, String httpsProxy, String message, String noProxy, String ref, List refs, String uri) { + super(); + this.author = author; + this.commit = commit; + this.committer = committer; + this.httpProxy = httpProxy; + this.httpsProxy = httpsProxy; + this.message = message; + this.noProxy = noProxy; + this.ref = ref; + this.refs = refs; + this.uri = uri; + } + + @JsonProperty("author") + public SourceControlUser getAuthor() { + return author; + } + + @JsonProperty("author") + public void setAuthor(SourceControlUser author) { + this.author = author; + } + + @JsonProperty("commit") + public String getCommit() { + return commit; + } + + @JsonProperty("commit") + public void setCommit(String commit) { + this.commit = commit; + } + + @JsonProperty("committer") + public SourceControlUser getCommitter() { + return committer; + } + + @JsonProperty("committer") + public void setCommitter(SourceControlUser committer) { + this.committer = committer; + } + + @JsonProperty("httpProxy") + public String getHttpProxy() { + return httpProxy; + } + + @JsonProperty("httpProxy") + public void setHttpProxy(String httpProxy) { + this.httpProxy = httpProxy; + } + + @JsonProperty("httpsProxy") + public String getHttpsProxy() { + return httpsProxy; + } + + @JsonProperty("httpsProxy") + public void setHttpsProxy(String httpsProxy) { + this.httpsProxy = httpsProxy; + } + + @JsonProperty("message") + public String getMessage() { + return message; + } + + @JsonProperty("message") + public void setMessage(String message) { + this.message = message; + } + + @JsonProperty("noProxy") + public String getNoProxy() { + return noProxy; + } + + @JsonProperty("noProxy") + public void setNoProxy(String noProxy) { + this.noProxy = noProxy; + } + + @JsonProperty("ref") + public String getRef() { + return ref; + } + + @JsonProperty("ref") + public void setRef(String ref) { + this.ref = ref; + } + + @JsonProperty("refs") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getRefs() { + return refs; + } + + @JsonProperty("refs") + public void setRefs(List refs) { + this.refs = refs; + } + + @JsonProperty("uri") + public String getUri() { + return uri; + } + + @JsonProperty("uri") + public void setUri(String uri) { + this.uri = uri; + } + + @JsonIgnore + public GitInfoBuilder edit() { + return new GitInfoBuilder(this); + } + + @JsonIgnore + public GitInfoBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/GitRefInfo.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/GitRefInfo.java new file mode 100644 index 00000000000..2c48974e650 --- /dev/null +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/GitRefInfo.java @@ -0,0 +1,220 @@ + +package io.fabric8.openshift.api.model; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "author", + "commit", + "committer", + "httpProxy", + "httpsProxy", + "message", + "noProxy", + "ref", + "uri" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Generated("jsonschema2pojo") +public class GitRefInfo implements Editable , KubernetesResource +{ + + @JsonProperty("author") + private SourceControlUser author; + @JsonProperty("commit") + private String commit; + @JsonProperty("committer") + private SourceControlUser committer; + @JsonProperty("httpProxy") + private String httpProxy; + @JsonProperty("httpsProxy") + private String httpsProxy; + @JsonProperty("message") + private String message; + @JsonProperty("noProxy") + private String noProxy; + @JsonProperty("ref") + private String ref; + @JsonProperty("uri") + private String uri; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public GitRefInfo() { + } + + public GitRefInfo(SourceControlUser author, String commit, SourceControlUser committer, String httpProxy, String httpsProxy, String message, String noProxy, String ref, String uri) { + super(); + this.author = author; + this.commit = commit; + this.committer = committer; + this.httpProxy = httpProxy; + this.httpsProxy = httpsProxy; + this.message = message; + this.noProxy = noProxy; + this.ref = ref; + this.uri = uri; + } + + @JsonProperty("author") + public SourceControlUser getAuthor() { + return author; + } + + @JsonProperty("author") + public void setAuthor(SourceControlUser author) { + this.author = author; + } + + @JsonProperty("commit") + public String getCommit() { + return commit; + } + + @JsonProperty("commit") + public void setCommit(String commit) { + this.commit = commit; + } + + @JsonProperty("committer") + public SourceControlUser getCommitter() { + return committer; + } + + @JsonProperty("committer") + public void setCommitter(SourceControlUser committer) { + this.committer = committer; + } + + @JsonProperty("httpProxy") + public String getHttpProxy() { + return httpProxy; + } + + @JsonProperty("httpProxy") + public void setHttpProxy(String httpProxy) { + this.httpProxy = httpProxy; + } + + @JsonProperty("httpsProxy") + public String getHttpsProxy() { + return httpsProxy; + } + + @JsonProperty("httpsProxy") + public void setHttpsProxy(String httpsProxy) { + this.httpsProxy = httpsProxy; + } + + @JsonProperty("message") + public String getMessage() { + return message; + } + + @JsonProperty("message") + public void setMessage(String message) { + this.message = message; + } + + @JsonProperty("noProxy") + public String getNoProxy() { + return noProxy; + } + + @JsonProperty("noProxy") + public void setNoProxy(String noProxy) { + this.noProxy = noProxy; + } + + @JsonProperty("ref") + public String getRef() { + return ref; + } + + @JsonProperty("ref") + public void setRef(String ref) { + this.ref = ref; + } + + @JsonProperty("uri") + public String getUri() { + return uri; + } + + @JsonProperty("uri") + public void setUri(String uri) { + this.uri = uri; + } + + @JsonIgnore + public GitRefInfoBuilder edit() { + return new GitRefInfoBuilder(this); + } + + @JsonIgnore + public GitRefInfoBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterResourceQuotaSpecQScopeSelector.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/GroupRestriction.java similarity index 73% rename from kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterResourceQuotaSpecQScopeSelector.java rename to kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/GroupRestriction.java index febf45a860e..904e09045d2 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterResourceQuotaSpecQScopeSelector.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/GroupRestriction.java @@ -33,7 +33,8 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "matchExpressions" + "groups", + "labels" }) @ToString @EqualsAndHashCode @@ -53,12 +54,15 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ClusterResourceQuotaSpecQScopeSelector implements Editable , KubernetesResource +public class GroupRestriction implements Editable , KubernetesResource { - @JsonProperty("matchExpressions") + @JsonProperty("groups") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List matchExpressions = new ArrayList<>(); + private List groups = new ArrayList<>(); + @JsonProperty("labels") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List labels = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -66,32 +70,44 @@ public class ClusterResourceQuotaSpecQScopeSelector implements Editable matchExpressions) { + public GroupRestriction(List groups, List labels) { super(); - this.matchExpressions = matchExpressions; + this.groups = groups; + this.labels = labels; + } + + @JsonProperty("groups") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getGroups() { + return groups; + } + + @JsonProperty("groups") + public void setGroups(List groups) { + this.groups = groups; } - @JsonProperty("matchExpressions") + @JsonProperty("labels") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getMatchExpressions() { - return matchExpressions; + public List getLabels() { + return labels; } - @JsonProperty("matchExpressions") - public void setMatchExpressions(List matchExpressions) { - this.matchExpressions = matchExpressions; + @JsonProperty("labels") + public void setLabels(List labels) { + this.labels = labels; } @JsonIgnore - public ClusterResourceQuotaSpecQScopeSelectorBuilder edit() { - return new ClusterResourceQuotaSpecQScopeSelectorBuilder(this); + public GroupRestrictionBuilder edit() { + return new GroupRestrictionBuilder(this); } @JsonIgnore - public ClusterResourceQuotaSpecQScopeSelectorBuilder toBuilder() { + public GroupRestrictionBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/IsPersonalSubjectAccessReview.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/IsPersonalSubjectAccessReview.java new file mode 100644 index 00000000000..76b51b7fb39 --- /dev/null +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/IsPersonalSubjectAccessReview.java @@ -0,0 +1,162 @@ + +package io.fabric8.openshift.api.model; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +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" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @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("authorization.openshift.io") +@Generated("jsonschema2pojo") +public class IsPersonalSubjectAccessReview implements Editable , KubernetesResource, Namespaced +{ + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + private String apiVersion = "authorization.openshift.io/v1"; + /** + * + * (Required) + * + */ + @JsonProperty("kind") + private String kind = "IsPersonalSubjectAccessReview"; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public IsPersonalSubjectAccessReview() { + } + + public IsPersonalSubjectAccessReview(String apiVersion, String kind) { + super(); + this.apiVersion = apiVersion; + this.kind = kind; + } + + /** + * + * (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; + } + + @JsonIgnore + public IsPersonalSubjectAccessReviewBuilder edit() { + return new IsPersonalSubjectAccessReviewBuilder(this); + } + + @JsonIgnore + public IsPersonalSubjectAccessReviewBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/NamedClusterRole.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/NamedClusterRole.java new file mode 100644 index 00000000000..32753a89c01 --- /dev/null +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/NamedClusterRole.java @@ -0,0 +1,122 @@ + +package io.fabric8.openshift.api.model; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import 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", + "role" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Generated("jsonschema2pojo") +public class NamedClusterRole implements Editable , KubernetesResource +{ + + @JsonProperty("name") + private String name; + @JsonProperty("role") + private ClusterRole role; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public NamedClusterRole() { + } + + public NamedClusterRole(String name, ClusterRole role) { + super(); + this.name = name; + this.role = role; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonProperty("role") + public ClusterRole getRole() { + return role; + } + + @JsonProperty("role") + public void setRole(ClusterRole role) { + this.role = role; + } + + @JsonIgnore + public NamedClusterRoleBuilder edit() { + return new NamedClusterRoleBuilder(this); + } + + @JsonIgnore + public NamedClusterRoleBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/NamedClusterRoleBinding.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/NamedClusterRoleBinding.java new file mode 100644 index 00000000000..9b3d62332e0 --- /dev/null +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/NamedClusterRoleBinding.java @@ -0,0 +1,122 @@ + +package io.fabric8.openshift.api.model; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import 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", + "roleBinding" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Generated("jsonschema2pojo") +public class NamedClusterRoleBinding implements Editable , KubernetesResource +{ + + @JsonProperty("name") + private String name; + @JsonProperty("roleBinding") + private ClusterRoleBinding roleBinding; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public NamedClusterRoleBinding() { + } + + public NamedClusterRoleBinding(String name, ClusterRoleBinding roleBinding) { + super(); + this.name = name; + this.roleBinding = roleBinding; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonProperty("roleBinding") + public ClusterRoleBinding getRoleBinding() { + return roleBinding; + } + + @JsonProperty("roleBinding") + public void setRoleBinding(ClusterRoleBinding roleBinding) { + this.roleBinding = roleBinding; + } + + @JsonIgnore + public NamedClusterRoleBindingBuilder edit() { + return new NamedClusterRoleBindingBuilder(this); + } + + @JsonIgnore + public NamedClusterRoleBindingBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/NamedRole.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/NamedRole.java new file mode 100644 index 00000000000..eafb4ac2754 --- /dev/null +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/NamedRole.java @@ -0,0 +1,122 @@ + +package io.fabric8.openshift.api.model; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import 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", + "role" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Generated("jsonschema2pojo") +public class NamedRole implements Editable , KubernetesResource +{ + + @JsonProperty("name") + private String name; + @JsonProperty("role") + private Role role; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public NamedRole() { + } + + public NamedRole(String name, Role role) { + super(); + this.name = name; + this.role = role; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonProperty("role") + public Role getRole() { + return role; + } + + @JsonProperty("role") + public void setRole(Role role) { + this.role = role; + } + + @JsonIgnore + public NamedRoleBuilder edit() { + return new NamedRoleBuilder(this); + } + + @JsonIgnore + public NamedRoleBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/NamedRoleBinding.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/NamedRoleBinding.java new file mode 100644 index 00000000000..de74d8d6533 --- /dev/null +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/NamedRoleBinding.java @@ -0,0 +1,122 @@ + +package io.fabric8.openshift.api.model; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import 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", + "roleBinding" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Generated("jsonschema2pojo") +public class NamedRoleBinding implements Editable , KubernetesResource +{ + + @JsonProperty("name") + private String name; + @JsonProperty("roleBinding") + private RoleBinding roleBinding; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public NamedRoleBinding() { + } + + public NamedRoleBinding(String name, RoleBinding roleBinding) { + super(); + this.name = name; + this.roleBinding = roleBinding; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonProperty("roleBinding") + public RoleBinding getRoleBinding() { + return roleBinding; + } + + @JsonProperty("roleBinding") + public void setRoleBinding(RoleBinding roleBinding) { + this.roleBinding = roleBinding; + } + + @JsonIgnore + public NamedRoleBindingBuilder edit() { + return new NamedRoleBindingBuilder(this); + } + + @JsonIgnore + public NamedRoleBindingBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuthRedirectReference.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuthRedirectReference.java new file mode 100644 index 00000000000..355bbcdd9a8 --- /dev/null +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuthRedirectReference.java @@ -0,0 +1,190 @@ + +package io.fabric8.openshift.api.model; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.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", + "reference" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @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("oauth.openshift.io") +@Generated("jsonschema2pojo") +public class OAuthRedirectReference implements Editable , HasMetadata, Namespaced +{ + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + private String apiVersion = "oauth.openshift.io/v1"; + /** + * + * (Required) + * + */ + @JsonProperty("kind") + private String kind = "OAuthRedirectReference"; + @JsonProperty("metadata") + private ObjectMeta metadata; + @JsonProperty("reference") + private RedirectReference reference; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public OAuthRedirectReference() { + } + + public OAuthRedirectReference(String apiVersion, String kind, ObjectMeta metadata, RedirectReference reference) { + super(); + this.apiVersion = apiVersion; + this.kind = kind; + this.metadata = metadata; + this.reference = reference; + } + + /** + * + * (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("reference") + public RedirectReference getReference() { + return reference; + } + + @JsonProperty("reference") + public void setReference(RedirectReference reference) { + this.reference = reference; + } + + @JsonIgnore + public OAuthRedirectReferenceBuilder edit() { + return new OAuthRedirectReferenceBuilder(this); + } + + @JsonIgnore + public OAuthRedirectReferenceBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterResourceQuotaSpecQSSMatchExpressions.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ProxyConfig.java similarity index 64% rename from kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterResourceQuotaSpecQSSMatchExpressions.java rename to kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ProxyConfig.java index 60d338cd3bb..bfc7f1587c3 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterResourceQuotaSpecQSSMatchExpressions.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ProxyConfig.java @@ -1,9 +1,7 @@ package io.fabric8.openshift.api.model; -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; @@ -33,9 +31,9 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "operator", - "scopeName", - "values" + "httpProxy", + "httpsProxy", + "noProxy" }) @ToString @EqualsAndHashCode @@ -55,16 +53,15 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ClusterResourceQuotaSpecQSSMatchExpressions implements Editable , KubernetesResource +public class ProxyConfig implements Editable , KubernetesResource { - @JsonProperty("operator") - private String operator; - @JsonProperty("scopeName") - private String scopeName; - @JsonProperty("values") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List values = new ArrayList<>(); + @JsonProperty("httpProxy") + private String httpProxy; + @JsonProperty("httpsProxy") + private String httpsProxy; + @JsonProperty("noProxy") + private String noProxy; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -72,54 +69,53 @@ public class ClusterResourceQuotaSpecQSSMatchExpressions implements Editable values) { + public ProxyConfig(String httpProxy, String httpsProxy, String noProxy) { super(); - this.operator = operator; - this.scopeName = scopeName; - this.values = values; + this.httpProxy = httpProxy; + this.httpsProxy = httpsProxy; + this.noProxy = noProxy; } - @JsonProperty("operator") - public String getOperator() { - return operator; + @JsonProperty("httpProxy") + public String getHttpProxy() { + return httpProxy; } - @JsonProperty("operator") - public void setOperator(String operator) { - this.operator = operator; + @JsonProperty("httpProxy") + public void setHttpProxy(String httpProxy) { + this.httpProxy = httpProxy; } - @JsonProperty("scopeName") - public String getScopeName() { - return scopeName; + @JsonProperty("httpsProxy") + public String getHttpsProxy() { + return httpsProxy; } - @JsonProperty("scopeName") - public void setScopeName(String scopeName) { - this.scopeName = scopeName; + @JsonProperty("httpsProxy") + public void setHttpsProxy(String httpsProxy) { + this.httpsProxy = httpsProxy; } - @JsonProperty("values") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getValues() { - return values; + @JsonProperty("noProxy") + public String getNoProxy() { + return noProxy; } - @JsonProperty("values") - public void setValues(List values) { - this.values = values; + @JsonProperty("noProxy") + public void setNoProxy(String noProxy) { + this.noProxy = noProxy; } @JsonIgnore - public ClusterResourceQuotaSpecQSSMatchExpressionsBuilder edit() { - return new ClusterResourceQuotaSpecQSSMatchExpressionsBuilder(this); + public ProxyConfigBuilder edit() { + return new ProxyConfigBuilder(this); } @JsonIgnore - public ClusterResourceQuotaSpecQSSMatchExpressionsBuilder toBuilder() { + public ProxyConfigBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RedirectReference.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RedirectReference.java new file mode 100644 index 00000000000..a28d908ae70 --- /dev/null +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RedirectReference.java @@ -0,0 +1,136 @@ + +package io.fabric8.openshift.api.model; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import 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", + "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 RedirectReference implements Editable , KubernetesResource +{ + + @JsonProperty("group") + private String group; + @JsonProperty("kind") + private String kind; + @JsonProperty("name") + private String name; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public RedirectReference() { + } + + public RedirectReference(String group, String kind, String name) { + super(); + this.group = group; + this.kind = kind; + this.name = name; + } + + @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; + } + + @JsonIgnore + public RedirectReferenceBuilder edit() { + return new RedirectReferenceBuilder(this); + } + + @JsonIgnore + public RedirectReferenceBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ResourceAccessReviewResponse.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ResourceAccessReviewResponse.java index 87dfa2c2bc0..58c266406d1 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ResourceAccessReviewResponse.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ResourceAccessReviewResponse.java @@ -19,13 +19,18 @@ import io.fabric8.kubernetes.api.model.KubernetesResource; 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; @@ -57,19 +62,34 @@ @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("authorization.openshift.io") @Generated("jsonschema2pojo") -public class ResourceAccessReviewResponse implements Editable , KubernetesResource +public class ResourceAccessReviewResponse implements Editable , KubernetesResource, Namespaced { + /** + * + * (Required) + * + */ @JsonProperty("apiVersion") - private String apiVersion; + private String apiVersion = "authorization.openshift.io/v1"; @JsonProperty("evalutionError") private String evalutionError; @JsonProperty("groups") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List groups = new ArrayList<>(); + /** + * + * (Required) + * + */ @JsonProperty("kind") - private String kind; + private String kind = "ResourceAccessReviewResponse"; @JsonProperty("namespace") private String namespace; @JsonProperty("users") @@ -95,11 +115,21 @@ public ResourceAccessReviewResponse(String apiVersion, String evalutionError, Li this.users = users; } + /** + * + * (Required) + * + */ @JsonProperty("apiVersion") public String getApiVersion() { return apiVersion; } + /** + * + * (Required) + * + */ @JsonProperty("apiVersion") public void setApiVersion(String apiVersion) { this.apiVersion = apiVersion; @@ -126,11 +156,21 @@ public void setGroups(List groups) { this.groups = groups; } + /** + * + * (Required) + * + */ @JsonProperty("kind") public String getKind() { return kind; } + /** + * + * (Required) + * + */ @JsonProperty("kind") public void setKind(String kind) { this.kind = kind; diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RoleBindingRestrictionSpec.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RoleBindingRestrictionSpec.java index de2e5ab7a7a..d57ce3803aa 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RoleBindingRestrictionSpec.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RoleBindingRestrictionSpec.java @@ -57,14 +57,11 @@ public class RoleBindingRestrictionSpec implements Editable additionalProperties = new LinkedHashMap(); @@ -75,7 +72,7 @@ public class RoleBindingRestrictionSpec implements Editable , KubernetesResource +{ + + @JsonProperty("dnsSuffix") + private String dnsSuffix; + @JsonProperty("shardName") + private String shardName; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public RouterShard() { + } + + public RouterShard(String dnsSuffix, String shardName) { + super(); + this.dnsSuffix = dnsSuffix; + this.shardName = shardName; + } + + @JsonProperty("dnsSuffix") + public String getDnsSuffix() { + return dnsSuffix; + } + + @JsonProperty("dnsSuffix") + public void setDnsSuffix(String dnsSuffix) { + this.dnsSuffix = dnsSuffix; + } + + @JsonProperty("shardName") + public String getShardName() { + return shardName; + } + + @JsonProperty("shardName") + public void setShardName(String shardName) { + this.shardName = shardName; + } + + @JsonIgnore + public RouterShardBuilder edit() { + return new RouterShardBuilder(this); + } + + @JsonIgnore + public RouterShardBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ServiceAccountReference.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ServiceAccountReference.java new file mode 100644 index 00000000000..c08237c262e --- /dev/null +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ServiceAccountReference.java @@ -0,0 +1,122 @@ + +package io.fabric8.openshift.api.model; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import 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", + "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 ServiceAccountReference implements Editable , KubernetesResource +{ + + @JsonProperty("name") + private String name; + @JsonProperty("namespace") + private String namespace; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ServiceAccountReference() { + } + + public ServiceAccountReference(String name, String namespace) { + super(); + this.name = name; + this.namespace = namespace; + } + + @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 ServiceAccountReferenceBuilder edit() { + return new ServiceAccountReferenceBuilder(this); + } + + @JsonIgnore + public ServiceAccountReferenceBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterResourceQuotaStatusTotal.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ServiceAccountRestriction.java similarity index 67% rename from kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterResourceQuotaStatusTotal.java rename to kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ServiceAccountRestriction.java index 53a4e851a7f..ea09a3ebabb 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterResourceQuotaStatusTotal.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ServiceAccountRestriction.java @@ -1,7 +1,9 @@ package io.fabric8.openshift.api.model; +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; @@ -31,8 +33,8 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "hard", - "used" + "namespaces", + "serviceaccounts" }) @ToString @EqualsAndHashCode @@ -52,17 +54,15 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ClusterResourceQuotaStatusTotal implements Editable , KubernetesResource +public class ServiceAccountRestriction implements Editable , KubernetesResource { - @JsonProperty("hard") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializerForMap.class) + @JsonProperty("namespaces") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Map hard = new LinkedHashMap<>(); - @JsonProperty("used") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializerForMap.class) + private List namespaces = new ArrayList<>(); + @JsonProperty("serviceaccounts") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Map used = new LinkedHashMap<>(); + private List serviceaccounts = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -70,46 +70,44 @@ public class ClusterResourceQuotaStatusTotal implements Editable hard, Map used) { + public ServiceAccountRestriction(List namespaces, List serviceaccounts) { super(); - this.hard = hard; - this.used = used; + this.namespaces = namespaces; + this.serviceaccounts = serviceaccounts; } - @JsonProperty("hard") + @JsonProperty("namespaces") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public Map getHard() { - return hard; + public List getNamespaces() { + return namespaces; } - @JsonProperty("hard") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializerForMap.class) - public void setHard(Map hard) { - this.hard = hard; + @JsonProperty("namespaces") + public void setNamespaces(List namespaces) { + this.namespaces = namespaces; } - @JsonProperty("used") + @JsonProperty("serviceaccounts") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public Map getUsed() { - return used; + public List getServiceaccounts() { + return serviceaccounts; } - @JsonProperty("used") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializerForMap.class) - public void setUsed(Map used) { - this.used = used; + @JsonProperty("serviceaccounts") + public void setServiceaccounts(List serviceaccounts) { + this.serviceaccounts = serviceaccounts; } @JsonIgnore - public ClusterResourceQuotaStatusTotalBuilder edit() { - return new ClusterResourceQuotaStatusTotalBuilder(this); + public ServiceAccountRestrictionBuilder edit() { + return new ServiceAccountRestrictionBuilder(this); } @JsonIgnore - public ClusterResourceQuotaStatusTotalBuilder toBuilder() { + public ServiceAccountRestrictionBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SignatureGenericEntity.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SignatureGenericEntity.java new file mode 100644 index 00000000000..633334764ba --- /dev/null +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SignatureGenericEntity.java @@ -0,0 +1,122 @@ + +package io.fabric8.openshift.api.model; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "commonName", + "organization" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Generated("jsonschema2pojo") +public class SignatureGenericEntity implements Editable , KubernetesResource +{ + + @JsonProperty("commonName") + private String commonName; + @JsonProperty("organization") + private String organization; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public SignatureGenericEntity() { + } + + public SignatureGenericEntity(String commonName, String organization) { + super(); + this.commonName = commonName; + this.organization = organization; + } + + @JsonProperty("commonName") + public String getCommonName() { + return commonName; + } + + @JsonProperty("commonName") + public void setCommonName(String commonName) { + this.commonName = commonName; + } + + @JsonProperty("organization") + public String getOrganization() { + return organization; + } + + @JsonProperty("organization") + public void setOrganization(String organization) { + this.organization = organization; + } + + @JsonIgnore + public SignatureGenericEntityBuilder edit() { + return new SignatureGenericEntityBuilder(this); + } + + @JsonIgnore + public SignatureGenericEntityBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SubjectAccessReviewResponse.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SubjectAccessReviewResponse.java index 57d4c6fdb47..409e5d58e37 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SubjectAccessReviewResponse.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SubjectAccessReviewResponse.java @@ -17,13 +17,18 @@ import io.fabric8.kubernetes.api.model.KubernetesResource; 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; @@ -55,18 +60,33 @@ @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("authorization.openshift.io") @Generated("jsonschema2pojo") -public class SubjectAccessReviewResponse implements Editable , KubernetesResource +public class SubjectAccessReviewResponse implements Editable , KubernetesResource, Namespaced { @JsonProperty("allowed") private Boolean allowed; + /** + * + * (Required) + * + */ @JsonProperty("apiVersion") - private String apiVersion; + private String apiVersion = "authorization.openshift.io/v1"; @JsonProperty("evaluationError") private String evaluationError; + /** + * + * (Required) + * + */ @JsonProperty("kind") - private String kind; + private String kind = "SubjectAccessReviewResponse"; @JsonProperty("namespace") private String namespace; @JsonProperty("reason") @@ -101,11 +121,21 @@ public void setAllowed(Boolean allowed) { this.allowed = allowed; } + /** + * + * (Required) + * + */ @JsonProperty("apiVersion") public String getApiVersion() { return apiVersion; } + /** + * + * (Required) + * + */ @JsonProperty("apiVersion") public void setApiVersion(String apiVersion) { this.apiVersion = apiVersion; @@ -121,11 +151,21 @@ public void setEvaluationError(String evaluationError) { this.evaluationError = evaluationError; } + /** + * + * (Required) + * + */ @JsonProperty("kind") public String getKind() { return kind; } + /** + * + * (Required) + * + */ @JsonProperty("kind") public void setKind(String kind) { this.kind = kind; diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterResourceQuotaSpecSelector.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/UserRestriction.java similarity index 67% rename from kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterResourceQuotaSpecSelector.java rename to kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/UserRestriction.java index 245a2096d6c..de86ce8753f 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterResourceQuotaSpecSelector.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/UserRestriction.java @@ -1,7 +1,9 @@ package io.fabric8.openshift.api.model; +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; @@ -31,8 +33,9 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "annotations", - "labels" + "groups", + "labels", + "users" }) @ToString @EqualsAndHashCode @@ -52,15 +55,18 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ClusterResourceQuotaSpecSelector implements Editable , KubernetesResource +public class UserRestriction implements Editable , KubernetesResource { - @JsonProperty("annotations") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - private Object annotations; + @JsonProperty("groups") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List groups = new ArrayList<>(); @JsonProperty("labels") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - private Object labels; + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List labels = new ArrayList<>(); + @JsonProperty("users") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List users = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -68,44 +74,56 @@ public class ClusterResourceQuotaSpecSelector implements Editable groups, List labels, List users) { super(); - this.annotations = annotations; + this.groups = groups; this.labels = labels; + this.users = users; } - @JsonProperty("annotations") - public Object getAnnotations() { - return annotations; + @JsonProperty("groups") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getGroups() { + return groups; } - @JsonProperty("annotations") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - public void setAnnotations(Object annotations) { - this.annotations = annotations; + @JsonProperty("groups") + public void setGroups(List groups) { + this.groups = groups; } @JsonProperty("labels") - public Object getLabels() { + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getLabels() { return labels; } @JsonProperty("labels") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - public void setLabels(Object labels) { + public void setLabels(List labels) { this.labels = labels; } + @JsonProperty("users") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getUsers() { + return users; + } + + @JsonProperty("users") + public void setUsers(List users) { + this.users = users; + } + @JsonIgnore - public ClusterResourceQuotaSpecSelectorBuilder edit() { - return new ClusterResourceQuotaSpecSelectorBuilder(this); + public UserRestrictionBuilder edit() { + return new UserRestrictionBuilder(this); } @JsonIgnore - public ClusterResourceQuotaSpecSelectorBuilder toBuilder() { + public UserRestrictionBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/pom.xml b/kubernetes-model-generator/pom.xml index cfa38304811..738fa435957 100644 --- a/kubernetes-model-generator/pom.xml +++ b/kubernetes-model-generator/pom.xml @@ -158,6 +158,20 @@ io.fabric8.kubernetes.api.model io.fabric8.kubernetes.api.model io.fabric8.kubernetes.api.model + io.fabric8.kubernetes.api.model + io.fabric8.kubernetes.api.model.rbac + io.fabric8.openshift.api.model + io.fabric8.openshift.api.model + io.fabric8.openshift.api.model + io.fabric8.openshift.api.model + io.fabric8.openshift.api.model + io.fabric8.openshift.api.model + io.fabric8.openshift.api.model + io.fabric8.openshift.api.model + io.fabric8.openshift.api.model + io.fabric8.openshift.api.model + io.fabric8.openshift.api.model + io.fabric8.openshift.api.model diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/RoleBindingRestrictionTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/RoleBindingRestrictionTest.java index 09f5cfea2dc..6723f3adb7f 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/RoleBindingRestrictionTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/RoleBindingRestrictionTest.java @@ -23,7 +23,6 @@ import org.junit.jupiter.api.Test; import java.net.HttpURLConnection; -import java.util.Collections; import static org.assertj.core.api.Assertions.assertThat; @@ -86,8 +85,9 @@ private RoleBindingRestriction createNewRoleBindingRestriction(String name) { return new RoleBindingRestrictionBuilder() .withNewMetadata().withName(name).endMetadata() .withNewSpec() - .withGrouprestriction( - Collections.singletonMap("groups", Collections.singletonList("groups-rolebindingrestriction"))) + .withNewGrouprestriction() + .addToGroups("groups-rolebindingrestriction") + .endGrouprestriction() .endSpec() .build(); }